Fixing a few warnings

OK, this one is the correct one...