Clean up some warnings.
Merge pull request #92 from square/jw/clean-up-warnings

Clean up some warnings.