Fix more lint errors.