FIxed a couple more warnings