Fix new lint errors

We'll get to lint parity soon and then not need to do this.