some fixes to get clang files working