Cleaning up some more warnings under GCC