*8824* Trivial linter fixes