Killed a few warnings