Some lint changes