Merge pull request #667 from slime73/Compiler-Warnings

Address several compiler warnings