clean up some more lint warnings