Fixed up more lint errors