Some clang fixes