[12774] more clang fixes