Get rid of some more lint warnings