Fix compiler warnings
Merge pull request #1725 from dmcdougall/fix_compiler_warnings

Fix compiler warnings