Minor fixes

I have zero idea why your 837c41e is in this PR; I think GH lost its mind