Merge pull request #414 from apache/tiny-improvments

Tiny improvements