Fixed remaining lint errors.