Fix compiler warnings
Merge pull request #1095 from DonLakeFlyer/CompilerWarnings

Fix compiler warnings