Fix lint

Latest round of PRs (#2700 and #2647) were not perfect