Fix GCC compiler problems