Another attempted Clang build fix