diff --git a/Applications/Crate/package/Classes/DockerCrate.yaml b/Applications/Crate/package/Classes/DockerCrate.yaml
index 47a72f0..82340df 100644
--- a/Applications/Crate/package/Classes/DockerCrate.yaml
+++ b/Applications/Crate/package/Classes/DockerCrate.yaml
@@ -31,7 +31,7 @@ Methods:
   .init:
     Body:
       - $._environment: $.find(std:Environment).require()
-      - $._scope: switch($.publish, $ => public, not $ => internal)
+      - $._scope: switch($.publish => public, true => internal)
 
 
   getContainer:
@@ -59,6 +59,6 @@ Methods:
               where($.scope = $this._scope and $.containerPort = 4200).
               select(format('http://{0}:{1}', $.address, $.port))
 
-          - $._environment.reporter.report($this, 'Application {0} is available at {1}'.format($.name, join(', ', $endpoints)))
+          - $._environment.reporter.report($this, 'Application {0} is available at {1}'.format($.name, $endpoints.join(', ')))
         Else:
           - $._environment.reporter.report($this, 'Application {0} has deployed but is not accessible from outside'.format($.name))
diff --git a/Applications/DockerApp/package/Classes/DockerApp.yaml b/Applications/DockerApp/package/Classes/DockerApp.yaml
index caad0b8..5299fe6 100644
--- a/Applications/DockerApp/package/Classes/DockerApp.yaml
+++ b/Applications/DockerApp/package/Classes/DockerApp.yaml
@@ -39,7 +39,7 @@ Methods:
   .init:
     Body:
       - $._environment: $.find(std:Environment).require()
-      - $._scope: switch($.publish, $ => public, not $ => internal)
+      - $._scope: switch($.publish => public, true => internal)
       - $._appPorts: $.ports.split(',').select(int($))
 
 
@@ -65,7 +65,7 @@ Methods:
               select(format('{0}:{1}', $.address, $.port))
 
           - $._environment.reporter.report($this, 'Application {0} is available at {1}'.format(
-              $.name, join(', ',  $endpoints)))
+              $.name, $endpoints.join(', ')))
         Else:
           - $._environment.reporter.report($this, 'Application {0} has deployed but is not accessible from outside'.format($.name))
 
diff --git a/Applications/Elasticsearch/package/Classes/DockerElasticsearch.yaml b/Applications/Elasticsearch/package/Classes/DockerElasticsearch.yaml
index a8086bd..14ac811 100644
--- a/Applications/Elasticsearch/package/Classes/DockerElasticsearch.yaml
+++ b/Applications/Elasticsearch/package/Classes/DockerElasticsearch.yaml
@@ -37,7 +37,7 @@ Methods:
   .init:
     Body:
       - $._environment: $.find(std:Environment).require()
-      - $._scope: switch($.publish, $ => public, not $ => internal)
+      - $._scope: switch($.publish => public, true => internal)
 
 
   getContainer:
@@ -63,6 +63,6 @@ Methods:
       - If: $.publish
         Then:
           - $endpoints: $.applicationEndpoints.where($.scope = $this._scope).select(format('http://{0}:{1}', $.address, $.port))
-          - $._environment.reporter.report($this, 'Elasticsearch {0} is available at {1}'.format($.name, join(', ', $endpoints)))
+          - $._environment.reporter.report($this, 'Elasticsearch {0} is available at {1}'.format($.name, $endpoints.join(', ')))
         Else:
           - $._environment.reporter.report($this, 'Elasticsearch {0} has deployed but is not accessible from outside'.format($.name))
diff --git a/Applications/GlassFish/package/Classes/DockerGlassFish.yaml b/Applications/GlassFish/package/Classes/DockerGlassFish.yaml
index b6fd81a..115fdb4 100644
--- a/Applications/GlassFish/package/Classes/DockerGlassFish.yaml
+++ b/Applications/GlassFish/package/Classes/DockerGlassFish.yaml
@@ -34,7 +34,7 @@ Methods:
   .init:
     Body:
       - $._environment: $.find(std:Environment).require()
-      - $._scope: switch($.publish, $ => public, not $ => internal)
+      - $._scope: switch($.publish => public, true => internal)
 
 
   getContainer:
diff --git a/Applications/Grafana/package/Classes/DockerGrafana.yaml b/Applications/Grafana/package/Classes/DockerGrafana.yaml
index 3890a80..5ee6bb9 100644
--- a/Applications/Grafana/package/Classes/DockerGrafana.yaml
+++ b/Applications/Grafana/package/Classes/DockerGrafana.yaml
@@ -43,7 +43,7 @@ Methods:
   .init:
     Body:
       - $._environment: $.find(std:Environment).require()
-      - $._scope: switch($.publish, $ => public, not $ => internal)
+      - $._scope: switch($.publish => public, true => internal)
 
 
   deploy:
@@ -82,6 +82,6 @@ Methods:
         Then:
           - $endpoints: $.applicationEndpoints.where($.scope = $this._scope).
               select(format('http://{0}:{1}', $.address, $.port))
-          - $._environment.reporter.report($this, 'Grafana {0} is available at {1}'.format($.name, join(', ', $endpoints)))
+          - $._environment.reporter.report($this, 'Grafana {0} is available at {1}'.format($.name, $endpoints.join(', ')))
         Else:
           - $._environment.reporter.report($this, 'Grafana {0} has deployed but is not accessible from outside'.format($.name))
diff --git a/Applications/GuestBook/package/Classes/GuestBook.yaml b/Applications/GuestBook/package/Classes/GuestBook.yaml
index d0f5fa6..e52f1cc 100644
--- a/Applications/GuestBook/package/Classes/GuestBook.yaml
+++ b/Applications/GuestBook/package/Classes/GuestBook.yaml
@@ -41,7 +41,7 @@ Methods:
   .init:
     Body:
       - $._environment: $.find(std:Environment).require()
-      - $._scope: switch($.publish, $ => public, not $ => internal)
+      - $._scope: switch($.publish => public, true => internal)
 
 
   deploy:
@@ -86,6 +86,6 @@ Methods:
         Then:
           - $endpoints: $.applicationEndpoints.where($.scope = $this._scope).
               select(format('{0}:{1}', $.address, $.port))
-          - $._environment.reporter.report($this, 'GuestBook {0} is available at {1}'.format($.name, join(', ', $endpoints)))
+          - $._environment.reporter.report($this, 'GuestBook {0} is available at {1}'.format($.name, $endpoints.join(', ')))
         Else:
           - $._environment.reporter.report($this, 'GuestBook {0} has deployed but is not accessible from outside'.format($.name))
diff --git a/Applications/GuestBook/package/Classes/RedisSlave.yaml b/Applications/GuestBook/package/Classes/RedisSlave.yaml
index 32fc170..8a87b79 100644
--- a/Applications/GuestBook/package/Classes/RedisSlave.yaml
+++ b/Applications/GuestBook/package/Classes/RedisSlave.yaml
@@ -42,4 +42,4 @@ Methods:
             REDIS_MASTER_SERVICE_PORT: $redisMasterLink.port
           ports:
             - port: 6379
-              scope: switch($.publish, $ => public, not $ => internal)
+              scope: switch($.publish => public, true => internal)
diff --git a/Applications/HTTPdServer/package/Classes/DockerHTTPd.yaml b/Applications/HTTPdServer/package/Classes/DockerHTTPd.yaml
index 50e64f3..270477e 100644
--- a/Applications/HTTPdServer/package/Classes/DockerHTTPd.yaml
+++ b/Applications/HTTPdServer/package/Classes/DockerHTTPd.yaml
@@ -31,7 +31,7 @@ Methods:
   .init:
     Body:
       - $._environment: $.find(std:Environment).require()
-      - $._scope: switch($.publish, $ => public, not $ => internal)
+      - $._scope: switch($.publish => public, true => internal)
 
 
   getContainer:
@@ -54,6 +54,6 @@ Methods:
       - If: $.publish
         Then:
           - $endpoints: $.applicationEndpoints.where($.scope = $this._scope).select(format('http://{0}:{1}', $.address, $.port))
-          - $._environment.reporter.report($this, 'HTTPd {0} is available at {1}'.format($.name, join(', ', $endpoints)))
+          - $._environment.reporter.report($this, 'HTTPd {0} is available at {1}'.format($.name, $endpoints.join(', ')))
         Else:
           - $._environment.reporter.report($this, 'HTTPd {0} has deployed but is not accessible from outside'.format($.name))
diff --git a/Applications/HTTPdSite/package/Classes/DockerHTTPdSite.yaml b/Applications/HTTPdSite/package/Classes/DockerHTTPdSite.yaml
index 6b540c1..5f12549 100644
--- a/Applications/HTTPdSite/package/Classes/DockerHTTPdSite.yaml
+++ b/Applications/HTTPdSite/package/Classes/DockerHTTPdSite.yaml
@@ -34,7 +34,7 @@ Methods:
   .init:
     Body:
       - $._environment: $.find(std:Environment).require()
-      - $._scope: switch($.publish, $ => public, not $ => internal)
+      - $._scope: switch($.publish => public, true => internal)
 
 
   getContainer:
@@ -59,6 +59,6 @@ Methods:
       - If: $.publish
         Then:
           - $endpoints: $.applicationEndpoints.where($.scope = $this._scope).select(format('http://{0}:{1}', $.address, $.port))
-          - $._environment.reporter.report($this, 'HTTPd application {0} is available at {1}'.format($.name, join(', ', $endpoints)))
+          - $._environment.reporter.report($this, 'HTTPd application {0} is available at {1}'.format($.name, $endpoints.join(', ')))
         Else:
           - $._environment.reporter.report($this, 'HTTPD application {0} has deployed but is not accessible from outside'.format($.name))
diff --git a/Applications/InfluxDB/package/Classes/DockerInfluxDB.yaml b/Applications/InfluxDB/package/Classes/DockerInfluxDB.yaml
index b25e888..7c25d3f 100644
--- a/Applications/InfluxDB/package/Classes/DockerInfluxDB.yaml
+++ b/Applications/InfluxDB/package/Classes/DockerInfluxDB.yaml
@@ -34,7 +34,7 @@ Methods:
   .init:
     Body:
       - $._environment: $.find(std:Environment).require()
-      - $._scope: switch($.publish, $ => public, not $ => internal)
+      - $._scope: switch($.publish => public, true => internal)
 
 
   getContainer:
@@ -68,6 +68,6 @@ Methods:
               where($.scope = $this._scope and $.containerPort = 8083).
               select(format('http://{0}:{1}', $.address, $.port))
 
-          - $._environment.reporter.report($this, 'InfluxDB {0} is available at {1}'.format($.name, join(', ', $endpoints)))
+          - $._environment.reporter.report($this, 'InfluxDB {0} is available at {1}'.format($.name, $endpoints.join(', ')))
         Else:
           - $._environment.reporter.report($this, 'InfluxDB {0} has deployed but is not accessible from outside'.format($.name))
diff --git a/Applications/JBoss/package/Classes/DockerJBoss.yaml b/Applications/JBoss/package/Classes/DockerJBoss.yaml
index 9b87fd5..7248315 100644
--- a/Applications/JBoss/package/Classes/DockerJBoss.yaml
+++ b/Applications/JBoss/package/Classes/DockerJBoss.yaml
@@ -34,7 +34,7 @@ Methods:
   .init:
     Body:
       - $._environment: $.find(std:Environment).require()
-      - $._scope: switch($.publish, $ => public, not $ => internal)
+      - $._scope: switch($.publish => public, true => internal)
 
 
   getContainer:
diff --git a/Applications/Jenkins/package/Classes/DockerJenkins.yaml b/Applications/Jenkins/package/Classes/DockerJenkins.yaml
index 234e5e6..702ca0e 100644
--- a/Applications/Jenkins/package/Classes/DockerJenkins.yaml
+++ b/Applications/Jenkins/package/Classes/DockerJenkins.yaml
@@ -31,7 +31,7 @@ Methods:
   .init:
     Body:
       - $._environment: $.find(std:Environment).require()
-      - $._scope: switch($.publish, $ => public, not $ => internal)
+      - $._scope: switch($.publish => public, true => internal)
 
 
   getContainer:
@@ -56,6 +56,6 @@ Methods:
           - $endpoints: $.applicationEndpoints.where($.scope = $this._scope).
               select(format('http://{0}:{1}', $.address, $.port))
 
-          - $._environment.reporter.report($this, 'Jenkins {0} is available at {1}'.format($.name, join(', ', $endpoints)))
+          - $._environment.reporter.report($this, 'Jenkins {0} is available at {1}'.format($.name, $endpoints.join(', ')))
         Else:
           - $._environment.reporter.report($this, 'Jenkins {0} has deployed but is not accessible from outside'.format($.name))
diff --git a/Applications/MariaDB/package/Classes/DockerMariaDB.yaml b/Applications/MariaDB/package/Classes/DockerMariaDB.yaml
index e7ec3e9..af30652 100644
--- a/Applications/MariaDB/package/Classes/DockerMariaDB.yaml
+++ b/Applications/MariaDB/package/Classes/DockerMariaDB.yaml
@@ -34,7 +34,7 @@ Methods:
   .init:
     Body:
       - $._environment: $.find(std:Environment).require()
-      - $._scope: switch($.publish, $ => public, not $ => internal)
+      - $._scope: switch($.publish => public, true => internal)
 
 
   getContainer:
@@ -61,6 +61,6 @@ Methods:
           - $endpoints: $.applicationEndpoints.where($.scope = $this._scope).
               select(format('{0}:{1}', $.address, $.port))
 
-          - $._environment.reporter.report($this, 'MariaDB {0} is available at {1}'.format($.name, join(', ', $endpoints)))
+          - $._environment.reporter.report($this, 'MariaDB {0} is available at {1}'.format($.name, $endpoints.join(', ')))
         Else:
           - $._environment.reporter.report($this, 'MariaDB {0} has deployed but is not accessible from outside'.format($.name))
diff --git a/Applications/MongoDB/package/Classes/DockerMongoDB.yaml b/Applications/MongoDB/package/Classes/DockerMongoDB.yaml
index d061eb9..91a1714 100644
--- a/Applications/MongoDB/package/Classes/DockerMongoDB.yaml
+++ b/Applications/MongoDB/package/Classes/DockerMongoDB.yaml
@@ -31,7 +31,7 @@ Methods:
   .init:
     Body:
       - $._environment: $.find(std:Environment).require()
-      - $._scope: switch($.publish, $ => public, not $ => internal)
+      - $._scope: switch($.publish => public, true => internal)
 
 
   getContainer:
@@ -56,6 +56,6 @@ Methods:
           - $endpoints: $.applicationEndpoints.where($.scope = $this._scope).
               select(format('{0}:{1}', $.address, $.port))
 
-          - $._environment.reporter.report($this, 'MongoDB {0} is available at {1}'.format($.name, join(', ', $endpoints)))
+          - $._environment.reporter.report($this, 'MongoDB {0} is available at {1}'.format($.name, $endpoints.join(', ')))
         Else:
           - $._environment.reporter.report($this, 'MongoDB {0} has deployed but is not accessible from outside'.format($.name))
diff --git a/Applications/MySQL/package/Classes/DockerMySQL.yaml b/Applications/MySQL/package/Classes/DockerMySQL.yaml
index 8c91d31..93b76fb 100644
--- a/Applications/MySQL/package/Classes/DockerMySQL.yaml
+++ b/Applications/MySQL/package/Classes/DockerMySQL.yaml
@@ -34,7 +34,7 @@ Methods:
   .init:
     Body:
       - $._environment: $.find(std:Environment).require()
-      - $._scope: switch($.publish, $ => public, not $ => internal)
+      - $._scope: switch($.publish => public, true => internal)
 
 
   getContainer:
@@ -61,6 +61,6 @@ Methods:
           - $endpoints: $.applicationEndpoints.where($.scope = $this._scope).
               select(format('{0}:{1}', $.address, $.port))
 
-          - $._environment.reporter.report($this, 'MySQL {0} is available at {1}'.format($.name, join(', ', $endpoints)))
+          - $._environment.reporter.report($this, 'MySQL {0} is available at {1}'.format($.name, $endpoints.join(', ')))
         Else:
           - $._environment.reporter.report($this, 'MySQL {0} has deployed but is not accessible from outside'.format($.name))
diff --git a/Applications/Nginx/package/Classes/DockerNginx.yaml b/Applications/Nginx/package/Classes/DockerNginx.yaml
index f7119e0..e4fce5d 100644
--- a/Applications/Nginx/package/Classes/DockerNginx.yaml
+++ b/Applications/Nginx/package/Classes/DockerNginx.yaml
@@ -31,7 +31,7 @@ Methods:
   .init:
     Body:
       - $._environment: $.find(std:Environment).require()
-      - $._scope: switch($.publish, $ => public, not $ => internal)
+      - $._scope: switch($.publish => public, true => internal)
 
 
   getContainer:
@@ -55,6 +55,6 @@ Methods:
         Then:
           - $endpoints: $.applicationEndpoints.where($.scope = $this._scope).
               select(format('http://{0}:{1}', $.address, $.port))
-          - $._environment.reporter.report($this, 'Nginx {0} is available at {1}'.format($.name, join(', ', $endpoints)))
+          - $._environment.reporter.report($this, 'Nginx {0} is available at {1}'.format($.name, $endpoints.join(', ')))
         Else:
           - $._environment.reporter.report($this, 'Nginx {0} has deployed but is not accessible from outside'.format($.name))
diff --git a/Applications/NginxSite/package/Classes/DockerNginxSite.yaml b/Applications/NginxSite/package/Classes/DockerNginxSite.yaml
index bfe34bc..77a29b1 100644
--- a/Applications/NginxSite/package/Classes/DockerNginxSite.yaml
+++ b/Applications/NginxSite/package/Classes/DockerNginxSite.yaml
@@ -34,7 +34,7 @@ Methods:
   .init:
     Body:
       - $._environment: $.find(std:Environment).require()
-      - $._scope: switch($.publish, $ => public, not $ => internal)
+      - $._scope: switch($.publish => public, true => internal)
 
 
   getContainer:
@@ -59,6 +59,6 @@ Methods:
       - If: $.publish
         Then:
           - $endpoints: $.applicationEndpoints.where($.scope = $this._scope).select(format('http://{0}:{1}', $.address, $.port))
-          - $._environment.reporter.report($this, 'Nginx application {0} is available at {1}'.format($.name, join(', ', $endpoints)))
+          - $._environment.reporter.report($this, 'Nginx application {0} is available at {1}'.format($.name, $endpoints.join(', ')))
         Else:
           - $._environment.reporter.report($this, 'Nginx application {0} has deployed but is not accessible from outside'.format($.name))
diff --git a/Applications/Orion/package/Classes/DockerOrion.yaml b/Applications/Orion/package/Classes/DockerOrion.yaml
index 859977c..63925df 100644
--- a/Applications/Orion/package/Classes/DockerOrion.yaml
+++ b/Applications/Orion/package/Classes/DockerOrion.yaml
@@ -33,7 +33,7 @@ Methods:
   .init:
     Body:
       - $._environment: $.find(std:Environment).require()
-      - $._scope: switch($.publish, $ => public, not $ => internal)
+      - $._scope: switch($.publish => public, true => internal)
 
   deploy:
     Body:
@@ -64,6 +64,6 @@ Methods:
         Then:
           - $endpoints: $.applicationEndpoints.where($.scope = $this._scope).
               select(format('http://{0}:{1}', $.address, $.port))
-          - $._environment.reporter.report($this, 'Orion {0} is available at {1}'.format($.name, join(', ', $endpoints)))
+          - $._environment.reporter.report($this, 'Orion {0} is available at {1}'.format($.name, $endpoints.join(', ')))
         Else:
           - $._environment.reporter.report($this, 'Orion {0} was deployed but is not accessible from outside'.format($.name))
diff --git a/Applications/PostgreSQL/package/Classes/DockerPostgreSQL.yaml b/Applications/PostgreSQL/package/Classes/DockerPostgreSQL.yaml
index 5885fcc..7e61248 100644
--- a/Applications/PostgreSQL/package/Classes/DockerPostgreSQL.yaml
+++ b/Applications/PostgreSQL/package/Classes/DockerPostgreSQL.yaml
@@ -34,7 +34,7 @@ Methods:
   .init:
     Body:
       - $._environment: $.find(std:Environment).require()
-      - $._scope: switch($.publish, $ => public, not $ => internal)
+      - $._scope: switch($.publish => public, true => internal)
 
 
   getContainer:
@@ -60,6 +60,6 @@ Methods:
         Then:
           - $endpoints: $.applicationEndpoints.where($.scope = $this._scope).
               select(format('{0}:{1}', $.address, $.port))
-          - $._environment.reporter.report($this, 'PostgreSQL {0} is available at {1}'.format($.name, join(', ', $endpoints)))
+          - $._environment.reporter.report($this, 'PostgreSQL {0} is available at {1}'.format($.name, $endpoints.join(', ')))
         Else:
           - $._environment.reporter.report($this, 'PostgreSQL {0} has deployed but is not accessible from outside'.format($.name))
diff --git a/Applications/Redis/package/Classes/DockerRedis.yaml b/Applications/Redis/package/Classes/DockerRedis.yaml
index 42d12e7..500c530 100644
--- a/Applications/Redis/package/Classes/DockerRedis.yaml
+++ b/Applications/Redis/package/Classes/DockerRedis.yaml
@@ -31,7 +31,7 @@ Methods:
   .init:
     Body:
       - $._environment: $.find(std:Environment).require()
-      - $._scope: switch($.publish, $ => public, not $ => internal)
+      - $._scope: switch($.publish => public, true => internal)
 
 
   getContainer:
@@ -55,6 +55,6 @@ Methods:
         Then:
           - $endpoints: $.applicationEndpoints.where($.scope = $this._scope).
               select(format('{0}:{1}', $.address, $.port))
-          - $._environment.reporter.report($this, 'Redis {0} is available at {1}'.format($.name, join(', ', $endpoints)))
+          - $._environment.reporter.report($this, 'Redis {0} is available at {1}'.format($.name, $endpoints.join(', ')))
         Else:
           - $._environment.reporter.report($this, 'Redis {0} has deployed but is not accessible from outside'.format($.name))
diff --git a/Applications/Tomcat/package/Classes/DockerTomcat.yaml b/Applications/Tomcat/package/Classes/DockerTomcat.yaml
index a69a4d8..0e04c0a 100644
--- a/Applications/Tomcat/package/Classes/DockerTomcat.yaml
+++ b/Applications/Tomcat/package/Classes/DockerTomcat.yaml
@@ -34,7 +34,7 @@ Methods:
   .init:
     Body:
       - $._environment: $.find(std:Environment).require()
-      - $._scope: switch($.publish, $ => public, not $ => internal)
+      - $._scope: switch($.publish => public, true => internal)
 
 
   getContainer:
@@ -60,6 +60,6 @@ Methods:
         Then:
           - $endpoints: $.applicationEndpoints.where($.scope = $this._scope).
               select(format('http://{0}:{1}', $.address, $.port))
-          - $._environment.reporter.report($this, 'Tomcat {0} is available at {1}'.format($.name, join(', ', $endpoints)))
+          - $._environment.reporter.report($this, 'Tomcat {0} is available at {1}'.format($.name, $endpoints.join(', ')))
         Else:
           - $._environment.reporter.report($this, 'Tomcat {0} has deployed but is not accessible from outside'.format($.name))
diff --git a/DockerInterfacesLibrary/package/Classes/DockerHelpers.yaml b/DockerInterfacesLibrary/package/Classes/DockerHelpers.yaml
index 6710d1b..106436c 100644
--- a/DockerInterfacesLibrary/package/Classes/DockerHelpers.yaml
+++ b/DockerInterfacesLibrary/package/Classes/DockerHelpers.yaml
@@ -39,4 +39,4 @@ Methods:
         Contract: 
           $.string().notNull(): $.string().notNull()
     Body:
-      - Return: join(';', $labelsMap.select(list($, $labelsMap.get($))).select(join('=', $)))
+      - Return: $labelsMap.select(list($, $labelsMap.get($)).join('=')).join(';')
diff --git a/DockerStandaloneHost/package/Classes/DockerStandaloneHost.yaml b/DockerStandaloneHost/package/Classes/DockerStandaloneHost.yaml
index 1ab2377..51c5879 100644
--- a/DockerStandaloneHost/package/Classes/DockerStandaloneHost.yaml
+++ b/DockerStandaloneHost/package/Classes/DockerStandaloneHost.yaml
@@ -114,7 +114,7 @@ Methods:
                   - $rule:
                       - ToPort: $hostPort
                         FromPort: $hostPort
-                        IpProtocol: toLower($applicationPort.protocol)
+                        IpProtocol: $applicationPort.protocol.toLower()
                         External: true
                   - $._environment.securityGroupManager.addGroupIngress($rule)
               - $record:
@@ -222,10 +222,10 @@ Methods:
           - Return: $applicationPorts.get($key)
 
       - $port: str($applicationPort.port)
-      - If: $port in $portMap
+      - If: $port in $portMap.keys()
         Then:
           - $port: '1025'
-      - While: $port in $portMap
+      - While: $port in $portMap.keys()
         Do:
           - $port: str(int($port) + 1)
 
diff --git a/Kubernetes/KubernetesCluster/package/Classes/KubernetesCluster.yaml b/Kubernetes/KubernetesCluster/package/Classes/KubernetesCluster.yaml
index e2a0213..c89e90c 100644
--- a/Kubernetes/KubernetesCluster/package/Classes/KubernetesCluster.yaml
+++ b/Kubernetes/KubernetesCluster/package/Classes/KubernetesCluster.yaml
@@ -252,7 +252,7 @@ Methods:
               - $securityGroupIngress:
                   - ToPort: $port
                     FromPort: $port
-                    IpProtocol: toLower($applicationPort.protocol)
+                    IpProtocol: $applicationPort.protocol.toLower()
                     External: $applicationPort.scope = public
               - $._environment.securityGroupManager.addGroupIngress($securityGroupIngress)
 
diff --git a/Kubernetes/KubernetesCluster/package/Classes/KubernetesGatewayNode.yaml b/Kubernetes/KubernetesCluster/package/Classes/KubernetesGatewayNode.yaml
index 53cbeb6..0f64dbb 100644
--- a/Kubernetes/KubernetesCluster/package/Classes/KubernetesGatewayNode.yaml
+++ b/Kubernetes/KubernetesCluster/package/Classes/KubernetesGatewayNode.yaml
@@ -31,7 +31,7 @@ Methods:
       - If: not $.getAttr(instanceDeployed, false)
         Then:
           - $._environment.reporter.report($this, 'Creating Gateway node for Kubernetes services')
-          - $.super($.deployInstance())
+          - super($, $.deployInstance())
           - $.setAttr(instanceDeployed, true)
 
   setupEtcd:
diff --git a/Kubernetes/KubernetesCluster/package/Classes/KubernetesMasterNode.yaml b/Kubernetes/KubernetesCluster/package/Classes/KubernetesMasterNode.yaml
index cf532b7..2543737 100644
--- a/Kubernetes/KubernetesCluster/package/Classes/KubernetesMasterNode.yaml
+++ b/Kubernetes/KubernetesCluster/package/Classes/KubernetesMasterNode.yaml
@@ -31,7 +31,7 @@ Methods:
       - If: not $.getAttr(instanceDeployed, false)
         Then:
           - $._environment.reporter.report($this, 'Creating Kubernetes Master')
-          - $.super($.deployInstance())
+          - super($, $.deployInstance())
           - $.setAttr(instanceDeployed, true)
 
 
diff --git a/Kubernetes/KubernetesCluster/package/Classes/KubernetesMinionNode.yaml b/Kubernetes/KubernetesCluster/package/Classes/KubernetesMinionNode.yaml
index 8515d92..547fd96 100644
--- a/Kubernetes/KubernetesCluster/package/Classes/KubernetesMinionNode.yaml
+++ b/Kubernetes/KubernetesCluster/package/Classes/KubernetesMinionNode.yaml
@@ -38,7 +38,7 @@ Methods:
       - If: not $.getAttr(instanceDeployed, false)
         Then:
           - $._environment.reporter.report($this, 'Creating Kubernetes Node {0}'.format($.instance.name))
-          - $.super($.deployInstance())
+          - super($, $.deployInstance())
           - $.setAttr(instanceDeployed, true)
 
 
diff --git a/Kubernetes/KubernetesPod/package/Classes/KubernetesPod.yaml b/Kubernetes/KubernetesPod/package/Classes/KubernetesPod.yaml
index e532d68..91e498b 100644
--- a/Kubernetes/KubernetesPod/package/Classes/KubernetesPod.yaml
+++ b/Kubernetes/KubernetesPod/package/Classes/KubernetesPod.yaml
@@ -76,14 +76,14 @@ Methods:
 
   _getPodName:
     Body:
-      - Return: toLower($.name)
+      - Return: $.name.toLower()
 
   _getPodLabels:
     Arguments:
       - podName:
           Contract: $.string().notNull()
     Body:
-      Return: $.labels2Map(toLower($.labels)).mergeWith(dict(id => $podName))
+      Return: $.labels2Map($.labels.toLower()).mergeWith(dict(id => $podName))
 
   hostContainer:
     Arguments:
@@ -105,7 +105,7 @@ Methods:
       - $._deleteContainer($container.name)
 
       - $containerDef:
-          name: toLower($container.name)
+          name: $container.name.toLower()
           image: $container.image
           args: $container.commands
           ports: $container.ports.select($this._getPortDefinition($))
@@ -185,7 +185,7 @@ Methods:
           Contract: $.string().notNull()
     Body:
       - $lenBefore: len($._podDefinition.spec.containers) + len($._podDefinition.spec.volumes)
-      - $containerName: toLower($name)
+      - $containerName: $name.toLower()
       - $newContainers: $._podDefinition.spec.containers.where($.name != $containerName)
       - $volumeNameMap: $.getAttr(volumeNameMap, dict())
       - $newVolumeNameMap: {}