Tidy some lint warnings