some more clang work