Fixing things I broke during linting