diff --git a/core/modules/block/block.install b/core/modules/block/block.install
index 520689b..da301c1 100644
--- a/core/modules/block/block.install
+++ b/core/modules/block/block.install
@@ -75,6 +75,7 @@ function block_schema() {
       'pages' => array(
         'type' => 'text',
         'not null' => TRUE,
+        'default' => '',
         'description' => 'Contents of the "Pages" block; contains either a list of paths on which to include/exclude the block or PHP code, depending on "visibility" setting.',
       ),
       'title' => array(
diff --git a/core/modules/block/lib/Drupal/block/BlockBase.php b/core/modules/block/lib/Drupal/block/BlockBase.php
index d23613c..322b550 100644
--- a/core/modules/block/lib/Drupal/block/BlockBase.php
+++ b/core/modules/block/lib/Drupal/block/BlockBase.php
@@ -376,7 +376,7 @@ public function configureValidateWrapper($form, &$form_state) {
       }
     }
     $form_state['values']['visibility']['role']['roles'] = array_filter($form_state['values']['visibility']['role']['roles']);
-    $this->configureValidate($form, &$form_state);
+    $this->configureValidate($form, $form_state);
   }
 
   /**
@@ -415,7 +415,7 @@ public function configureSubmitWrapper($form, &$form_state) {
       }
       drupal_set_message(t('The block configuration has been saved.'));
       drupal_flush_all_caches();
-      $this->configureSubmit($form, &$form_state);
+      $this->configureSubmit($form, $form_state);
     }
   }
 
diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockAdminThemeTest.php b/core/modules/block/lib/Drupal/block/Tests/BlockAdminThemeTest.php
index c3a220f..8c64ac8 100644
--- a/core/modules/block/lib/Drupal/block/Tests/BlockAdminThemeTest.php
+++ b/core/modules/block/lib/Drupal/block/Tests/BlockAdminThemeTest.php
@@ -38,14 +38,14 @@ function testAdminTheme() {
     $this->drupalLogin($admin_user);
 
     // Ensure that access to block admin page is denied when theme is disabled.
-    $this->drupalGet('admin/structure/block/list/bartik');
+    $this->drupalGet('admin/structure/block/list/block_plugin_ui:bartik');
     $this->assertResponse(403);
 
     // Enable admin theme and confirm that tab is accessible.
     theme_enable(array('bartik'));
     $edit['admin_theme'] = 'bartik';
     $this->drupalPost('admin/appearance', $edit, t('Save configuration'));
-    $this->drupalGet('admin/structure/block/list/bartik');
+    $this->drupalGet('admin/structure/block/list/block_plugin_ui:bartik');
     $this->assertResponse(200);
   }
 }