Removing a few warnings