GCC build fixes.