Fix more lint errors