diff --git a/src/com/mirantis/mk/Helm.groovy b/src/com/mirantis/mk/Helm.groovy
index 280bf63..72d95cb 100644
--- a/src/com/mirantis/mk/Helm.groovy
+++ b/src/com/mirantis/mk/Helm.groovy
@@ -44,7 +44,7 @@
         }
         helmExtraParams += " --merge index-upstream.yaml"
     }
-    helm.helmRepoIndex(helmExtraParams, helmRepoDir)
+    helmRepoIndex(helmExtraParams, helmRepoDir)
 }
 
 /**
diff --git a/src/com/mirantis/mk/Orchestrate.groovy b/src/com/mirantis/mk/Orchestrate.groovy
index 92ac297..59e21a4 100644
--- a/src/com/mirantis/mk/Orchestrate.groovy
+++ b/src/com/mirantis/mk/Orchestrate.groovy
@@ -55,6 +55,9 @@
 
     salt.enforceState([saltId: master, target: "* ${extra_tgt}", state: ['salt.minion'], failOnError: false, batch: batch, read_timeout: 180, retries: 2])
 
+    // WA for PROD-33911
+    salt.enforceState([saltId: master, target: "I@linux:system ${extra_tgt}", state: ['openssh'], batch: batch])
+
     sleep(5)
 
     salt.fullRefresh(master, "* ${extra_tgt}", batch)
diff --git a/src/com/mirantis/mk/Salt.groovy b/src/com/mirantis/mk/Salt.groovy
index 407e457..8c6384c 100644
--- a/src/com/mirantis/mk/Salt.groovy
+++ b/src/com/mirantis/mk/Salt.groovy
@@ -1383,7 +1383,7 @@
     if (res) {
         for (int i = 0; i < res.size(); i++) {
             def key = res.keySet()[i]
-            if (!(res[key] instanceof Map && res[key].get(params.packageName, false))) {
+            if (!(res[key] instanceof Map && res[key].get(params.packageName.toString(), false))) {
                 return false
             }
         }