chore: misc small cleanups

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