chore: misc small fixups

Nigel Kukard requested to merge nkukard/conarx-containers-celery:nkupdates-v3.17 into v3.17 Mar 08, 2023