removing compile warnings
Merge pull request #2319 from AndrewMeadows/warnings

removing a few compile warnings