Fix lint warnings, style fixups

Followup work for recent PRs
My bad, sorry.