Fix compiler warnings
Merge pull request #85 from asmaloney/compile_fixes

Fix compiler warnings