diff --git a/ee/cli/plugins/site.py b/ee/cli/plugins/site.py
index 0a114bdc..65e0f53a 100644
--- a/ee/cli/plugins/site.py
+++ b/ee/cli/plugins/site.py
@@ -973,11 +973,17 @@ class EESiteUpdateController(CementBaseController):
                       .format(ee_domain))
 
         ee_auth = site_package_check(self, stype)
+
         sitebackup(self, data)
 
         # setup NGINX configuration, and webroot
         setupdomain(self, data)
 
+        if stype == oldsitetype and cache == oldcachetype:
+            Log.info(self, "Successfully updated site"
+                     " http://{0}".format(ee_domain))
+            self.app.close(0)
+
         if 'ee_db_name' in data.keys() and not data['wp']:
             data = setupdatabase(self, data)
             try:
diff --git a/ee/cli/plugins/site_functions.py b/ee/cli/plugins/site_functions.py
index d7dcd6fe..91c61193 100644
--- a/ee/cli/plugins/site_functions.py
+++ b/ee/cli/plugins/site_functions.py
@@ -455,6 +455,12 @@ def site_package_check(self, stype):
                                     "wp-cli-{0}.phar"
                                     .format(EEVariables.ee_wp_cli),
                                     "/usr/bin/wp", "WP-CLI"]]
+
+    if self.app.pargs.hhvm:
+        Log.debug(self, "Setting apt_packages variable for HHVM")
+        if not EEAptGet.is_installed(self, 'hhvm'):
+            apt_packages = apt_packages + EEVariables.ee_hhvm
+
     return(stack.install(apt_packages=apt_packages, packages=packages,
                          disp_msg=False))