Some fixes that clang64 on OSX was kind enough to point out for me.