This PR fixes polishes trivial stuff.

Comment From: pivotal-issuemaster

@drgnchan Please sign the Contributor License Agreement!

Click here to manually synchronize the status of this Pull Request.

See the FAQ for frequently asked questions.

Comment From: pivotal-issuemaster

@drgnchan Thank you for signing the Contributor License Agreement!

Comment From: sbrannen

This has been merged into master.

Thanks