Fix more linting stuff