Fix the GCC errors