Remove a few warnings