More GCC compile fixes