Fixed a couple Clang warnings
Merge pull request #2699 from swisspol/fix_warnings

Fixed a couple Clang warnings