Clang warnings

Fix some warnings found by clang