Small tweaks.
Merge pull request #145 from square/jw/small

Small tweaks.