Some lint fixes