Removing a few warnings...