Fixed a few warnings