Fix the build errors on new versions of gcc.