diff --git a/manifest.jps b/manifest.jps
index a8130b69..17655340 100644
--- a/manifest.jps
+++ b/manifest.jps
@@ -193,7 +193,7 @@ actions:
 
   callScript:
     script: |
-      var targetAppid = api.dev.apps.CreatePersistence ? "${globals.envAppid}" : appid;
+      var targetAppid = api.dev.apps.CreatePersistence ? appid : appid;
       var resp = api.dev.scripting.Eval(targetAppid, session, '${env.envName}-${targetNodes.nodeGroup}-${globals.scriptSufix}', {action:'${this.action}'});
       if (resp.result == 0 && typeof resp.response === 'object' && resp.response.result != 0) resp = resp.response;
       return resp;
@@ -247,7 +247,7 @@ actions:
 
   delete:
     script: |
-      var targetAppid = api.dev.apps.CreatePersistence ? "${globals.envAppid}" : appid;
+      var targetAppid = api.dev.apps.CreatePersistence ? appid : appid;
       api.dev.scripting.DeleteScript(targetAppid, session, '${env.envName}-${targetNodes.nodeGroup}-${globals.scriptSufix}');
       return {result:0}
 
@@ -269,7 +269,7 @@ actions:
 
   createScript:
     script: |
-      var targetAppid = api.dev.apps.CreatePersistence ? "${globals.envAppid}" : appid;
+      var targetAppid = api.dev.apps.CreatePersistence ? appid : appid;
       return api.dev.scripting.CreateScript(targetAppid, session, "${this.scriptName}", "js", "${this.code:}")
 
 success: /text/success.md
diff --git a/scripts/generate-ssl-cert.sh b/scripts/generate-ssl-cert.sh
index 73aa2409..337bb13f 100755
--- a/scripts/generate-ssl-cert.sh
+++ b/scripts/generate-ssl-cert.sh
@@ -124,7 +124,7 @@ do
     all_invalid_domains_errors+=$error";"
     all_invalid_domains+=$invalid_domain" "
 
-    domain=$(echo $domain | sed 's/^'${invalid_domain}'\s-d\s//' | sed 's/\s-d\s'${invalid_domain}'\s-d\s//' | sed 's/\s-d\s'${invalid_domain}'$//' | sed 's/'${invalid_domain}'//')
+    domain=$(echo $domain | sed 's/^'${invalid_domain}'\s-d\s//' | sed 's/\s-d\s'${invalid_domain}'\s-d\s/ -d /' | sed 's/\s-d\s'${invalid_domain}'$//' | sed 's/^'${invalid_domain}'$//')
   }
   counter=$((counter + 1))
 done
diff --git a/scripts/ssl-manager.js b/scripts/ssl-manager.js
index d2bfdfa9..e866a34e 100644
--- a/scripts/ssl-manager.js
+++ b/scripts/ssl-manager.js
@@ -80,7 +80,7 @@ function SSLManager(config) {
     config = config || {};
     session = config.session || "";
 
-    targetAppid = api.dev.apps.CreatePersistence ? config.envAppid : appid;
+    targetAppid = api.dev.apps.CreatePersistence ? appid : appid;
 
     nodeManager = new NodeManager(config.envName, config.nodeId, config.baseDir);
     nodeManager.setLogPath("var/log/letsencrypt.log");