Fix the clang issues