Fixing a few warnings