More GCC fixes