More Clang fixes