Clean lint warnings