Fix several lints

Merged
JA
2y ago
+906-1280

What does this PR do?

Fix several lints

How did you verify your code works?