fixes for new version of eslint