Fixed clang mapping