Try again to fix the clang issues