Got rid of some more GCC warnings