More fixes for GCC.