Fix the GCC and Clang builds.