Some linting fixes
What does this PR do?
It fixes various linter errors and warnings. Kinda related to !619.
Contribution Guidelines By submitting this merge request, you agree to follow our Contribution Guidelines
-
I agree to follow this project's Contribution Guidelines -
I have made sure to test this pull request