GCC build fixes