Fix more gcc-specific compile errors