diff --git a/platform/drupal/clear_8.inc b/platform/drupal/clear_8.inc
index 26135ce904442ed401c8c076942ea261b34aa713..c8001cee70d76dd92eeb3874380243882c5c38ae 100644
--- a/platform/drupal/clear_8.inc
+++ b/platform/drupal/clear_8.inc
@@ -5,17 +5,24 @@
  *    Rebuild all the caches
  */
 
-cache_clear_all();
-drush_log(t('Cleared all caches'));
+node_types_rebuild(); // d5, d6, d7, d8
+drush_log(t('Rebuilt node types cache'));
 
-node_types_rebuild();
-drush_log(t('Rebuilt node type cache'));
+drupal_flush_all_caches(); // d6, d7, d8
+drush_log(t('All caches cleared'));
 
-registry_rebuild();
-drush_log(t('Rebuilt code registry'));
+// Available in d6 and d7 only
+//cache_clear_all();
+//drush_log(t('Cleared all caches'));
 
-system_rebuild_theme_data();
-drush_log(t('Rebuilt theme cache'));
+// Included in drupal_flush_all_caches()
+//registry_rebuild();
+//drush_log(t('Rebuilt code registry'));
 
-menu_rebuild();
-drush_log(t('Rebuilt menu cache'));
+// Included in drupal_flush_all_caches()
+//system_rebuild_theme_data();
+//drush_log(t('Rebuilt theme cache'));
+
+// Available in d5, d6, d7 only
+//menu_rebuild();
+//drush_log(t('Rebuilt menu cache'));
diff --git a/platform/drupal/install_8.inc b/platform/drupal/install_8.inc
index 0ed9674e9bc1c3bb0983cecd01277ede684e695c..6a271c3817e8e912c074b8ad623dfce8d75d8974 100644
--- a/platform/drupal/install_8.inc
+++ b/platform/drupal/install_8.inc
@@ -138,15 +138,15 @@ function install_main() {
 
   // create the admin account
   $account = user_load(1);
-  $edit['name'] = 'admin';
-  $edit['pass'] = $account_pass;
-  $edit['mail'] = $client_email;
-  $edit['status'] = 1;
+  $account->name = 'admin';
+  $account->pass = $account_pass;
+  $account->mail = $client_email;
+  $account->status = 1;
 
   // temporarily disable drupal's default mail notification
   $prev = variable_get('user_mail_status_activated_notify', TRUE);
   variable_set('user_mail_status_activated_notify', FALSE);
-  $account = user_save($account,  $edit);
+  $account->save();
   variable_set('user_mail_status_activated_notify', $prev);
 
   $onetime = user_pass_reset_url($account);