Integrate pull request feedback.

Few small fixes based on pull request feedback.