Fix more GCC warnings