Took care of a few warnings