Clean up some lint warnings