Clang fixes