Fix GCC errors