Make lint fixes