Fixed clang support