Merge pull request #1433 from dsacre/fix-clang-warnings

Fix Clang warnings