Just some small tweaks.
Merge pull request #1222 from square/jw/small-tweaks

Just some small tweaks.