Improve clang-wrapper