Corrected a few warnings