Fixed more warnings from Clang