Fix compiler warnings
Merge pull request #1145 from DonLakeFlyer/MoreWarnings

Fix compiler warnings