Misc issues from PR 154 https://github.com/calypr/argo-helm/pull/154/changes#r2658247644 https://github.com/calypr/argo-helm/pull/154/changes#r2658248155 https://github.com/calypr/argo-helm/pull/154/changes#r2658247083 https://github.com/calypr/argo-helm/pull/154/changes#r2658249943
