Even more GCC fixes