Fix more linting issues