Fix issues found by eslint