More clang fixes

Same as #4004, just for 72X in case people do not want to have it in 71X for some reason.