Fix remaining lint errors