diff --git a/core/modules/field_ui/field_ui.module b/core/modules/field_ui/field_ui.module
index e9e4cd0..3ddaa03 100644
--- a/core/modules/field_ui/field_ui.module
+++ b/core/modules/field_ui/field_ui.module
@@ -369,12 +369,10 @@ function field_ui_inactive_instances($entity_type, $bundle_name = NULL) {
 function field_ui_form_node_type_form_alter(&$form, $form_state) {
   // We want to display the button only on add page.
   if ($form_state['entity']->isNew()) {
-    $form['actions']['save_continue'] = array(
-      '#type' => 'submit',
-      '#value' => t('Save and manage fields'),
-      '#weight' => 45,
-    );
-    $form['#submit'][] = 'field_ui_form_node_type_form_submit';
+    $form['actions']['save_continue'] = $form['actions']['submit'];
+    $form['actions']['save_continue']['#value'] = t('Save and manage fields');
+    $form['actions']['save_continue']['#weight'] = $form['actions']['save_continue']['#weight'] + 5;
+    $form['actions']['save_continue']['#submit'][] = 'field_ui_form_node_type_form_submit';
   }
 }
 
diff --git a/core/modules/node/node.install b/core/modules/node/node.install
index 58e8c23..fbf7417 100644
--- a/core/modules/node/node.install
+++ b/core/modules/node/node.install
@@ -628,6 +628,7 @@ function node_update_8014() {
         'node_options_' . $id,
       ),
     ))->fetchAllKeyed();
+    $variables = array_map('unserialize', $variables);
     // There are not necessarily values for all settings, so pollute defaults.
     $variables += array(
       'node_submitted_' . $id => TRUE,
@@ -637,7 +638,6 @@ function node_update_8014() {
     foreach ($variables as $name => $value) {
       // Turn e.g. 'node_submitted_ID' into 'submitted'.
       $name = str_replace(array('node_', '_' . $id), '', $name);
-      $value = unserialize($value);
       $config->set('settings.node.' . $name, $value);
 
       update_variable_del($name);
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index c520b3b..1672b3f 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -626,6 +626,10 @@ function node_rdf_mapping() {
  *   A string containing the function name or FALSE if it isn't found.
  */
 function node_hook($id, $hook) {
+  // $id can be NULL for nodes that have been created without a type.
+  if (!isset($id)) {
+    return FALSE;
+  }
   if (!$type = entity_load('node_type', $id)) {
     return FALSE;
   }
diff --git a/core/modules/rest/lib/Drupal/rest/Tests/DeleteTest.php b/core/modules/rest/lib/Drupal/rest/Tests/DeleteTest.php
index 66f85c4..7080580 100644
--- a/core/modules/rest/lib/Drupal/rest/Tests/DeleteTest.php
+++ b/core/modules/rest/lib/Drupal/rest/Tests/DeleteTest.php
@@ -29,6 +29,12 @@ public static function getInfo() {
     );
   }
 
+  function setUp() {
+    parent::setUp();
+    // Create necessarily entity bundles.
+    $this->drupalCreateContentType(array('type' => 'article'));
+  }
+
   /**
    * Tests several valid and invalid delete requests on all entity types.
    */