Fixed more Clang warnings