Cleaned up a few warnings