Some minor clang/llvm fixes