Fix clang patches