Fixing a few warnings brought up by prospector