Clean up some other scary stuff
Merge pull request #29 from ekr/other_compile_fixes

Clean up some other scary stuff