chore: misc small fixups

Nigel Kukard requested to merge nkukard/containers-saltstack:nkupdates-edge into edge Mar 08, 2023