Get rid of more warnings