Merge pull request #1249 from tnull/fix_compile_warnings