Fix the last of the GCC warnings