Correct lint warnings #38