Correct lint warnings