Fixing some more GCC warnings