Fixed up remaining lint errors