Cleanup clang warnings