Do your fix as one commit. Fixing the rest isn't required, but is nice to do, so for that do a separate PR with

```MAINT: <message>

Blah, Blah
```