fix linting issues on 2.0