Some lint corrections