Got rid of some more warnings