Fix some warnings.
Merge pull request #55 from markbt/warnings

Fix some warnings.