Changes to make the linter stop being a baby