Fix a couple of compilation warnings
Merge pull request #57 from bbatsov/compilation-warnings

Fix a couple of compilation warnings