diff --git a/ee/cli/plugins/debug.py b/ee/cli/plugins/debug.py
index cad14b93..a450e024 100644
--- a/ee/cli/plugins/debug.py
+++ b/ee/cli/plugins/debug.py
@@ -179,7 +179,8 @@ class EEDebugController(CementBaseController):
                     hhvmconf=True
                 else:
                     hhvmconf=False
-                data = dict(php="9001", debug="9001", hhvm="9001", hhvmconf)
+                data = dict(php="9001", debug="9001", hhvm="9001",
+                            hhvmconf=hhvmconf)
                 Log.debug(self, 'Writting the Nginx debug configration to file'
                                 ' /etc/nginx/conf.d/upstream.conf ')
                 ee_nginx = open('/etc/nginx/conf.d/upstream.conf',
@@ -223,7 +224,8 @@ class EEDebugController(CementBaseController):
                     hhvmconf=True
                 else:
                     hhvmconf=False
-                data = dict(php="9001", debug="9001", hhvm="9001", hhvmconf)
+                data = dict(php="9001", debug="9001", hhvm="9001",
+                            hhvmconf=hhvmcof)
 
                 data = dict(php="9000", debug="9001", hhvm="8000")
                 Log.debug(self, 'Writting the Nginx debug configration to file'
diff --git a/ee/cli/plugins/site.py b/ee/cli/plugins/site.py
index 4062124e..e6134f65 100644
--- a/ee/cli/plugins/site.py
+++ b/ee/cli/plugins/site.py
@@ -359,7 +359,9 @@ class EESiteCreateController(CementBaseController):
                 dict(help="provide password for wordpress user",
                      dest='wppass')),
             (['--proxy'],
-                dict(help="create proxy for site", nargs='+'))
+                dict(help="create proxy for site", nargs='+')),
+            (['--experimental'],
+                dict(help="Enable Experimenal packages without prompt")),
             ]
 
     @expose(hide=True)
@@ -470,7 +472,7 @@ class EESiteCreateController(CementBaseController):
                 # Check prompt
                 check_prompt = input("Type \"y\" to continue [n]")
                 if check_prompt != "Y" and check_prompt != "y":
-                    Log.info("Not using HHVM for site.")
+                    Log.info(self, "Not using HHVM for site.")
                     data['hhvm'] = False
                     hhvm = 0
                 else:
@@ -494,7 +496,7 @@ class EESiteCreateController(CementBaseController):
                 # Check prompt
                 check_prompt = input("Type \"y\" to continue [n]")
                 if check_prompt != "Y" and check_prompt != "y":
-                    Log.info("Not using PageSpeed for site.")
+                    Log.info(self, "Not using PageSpeed for site.")
                     data['pagespeed'] = False
                     pagespeed = 0
                 else:
@@ -737,7 +739,9 @@ class EESiteUpdateController(CementBaseController):
                      action='store' or 'store_const',
                      choices=('on', 'off'), const='on', nargs='?')),
             (['--proxy'],
-                dict(help="update to prxy site", nargs='+')),
+                dict(help="update to proxy site", nargs='+')),
+            (['--experimental'],
+                dict(help="Enable Experimenal packages without prompt")),
             (['--all'],
                 dict(help="update all sites", action='store_true')),
             ]
@@ -1000,16 +1004,16 @@ class EESiteUpdateController(CementBaseController):
 
         if pargs.pagespeed or pargs.hhvm:
             if pargs.hhvm:
-                if (not self.app.pargs.experimental):
+                if (not pargs.experimental):
                     Log.info(self, "HHVM is experimental feature and it may not"
-                             "work with all plugins all your site.\nYou can "
+                             " work with all plugins all your site.\nYou can "
                              "disable it by passing --hhvm=off later.\nDo you wish"
                              " to enable HHVM now for {0}?".format(ee_domain))
 
                     # Check prompt
                     check_prompt = input("Type \"y\" to continue [n]")
                     if check_prompt != "Y" and check_prompt != "y":
-                        Log.info("Not using HHVM for site.")
+                        Log.info(self, "Not using HHVM for site.")
                         data['hhvm'] = False
                         hhvm = False
                     else:
@@ -1020,7 +1024,7 @@ class EESiteUpdateController(CementBaseController):
                     hhvm = True
 
             if pargs.pagespeed:
-                if (not self.app.pargs.experimental):
+                if (not pargs.experimental):
                     Log.info(self, "PageSpeed is experimental feature and it may not"
                              "work with all CSS/JS/Cache of your site.\nYou can "
                              "disable it by passing --pagespeed=off later.\nDo you wish"