Fix GCC compile errors