Fix some GCC errors