Got rid of a few warnings