chore: misc fixups

Nigel Kukard requested to merge nkukard/containers-docker-in-docker:nkupdates-edge into edge Mar 07, 2023