More GCC fixes.