Remove lint warnings