Fixes to pass linting

Oh, it's being added to the head! Sorry