Got rid of more warnings in Clang