Fixing some errors in clang/clang++