diff --git a/includes/Settings.php b/includes/Settings.php
index 6dce3f9378c2..5c49345fd4e3 100644
--- a/includes/Settings.php
+++ b/includes/Settings.php
@@ -577,7 +577,8 @@ protected function get_registered_options(): array {
 			$default_schema = [
 				'type'        => empty( $args['type'] ) ? null : $args['type'],
 				'description' => empty( $args['description'] ) ? '' : $args['description'],
-				'default'     => $args['default'],
+				// @phpstan-ignore nullCoalesce.unnecessary (False positive)
+				'default'     => $args['default'] ?? null,
 			];
 
 			$schema = array_merge( $default_schema, $rest_args['schema'] );
diff --git a/packages/e2e-test-utils/src/trashAllTerms.js b/packages/e2e-test-utils/src/trashAllTerms.js
index 467367e9a668..6607ce465bd5 100644
--- a/packages/e2e-test-utils/src/trashAllTerms.js
+++ b/packages/e2e-test-utils/src/trashAllTerms.js
@@ -33,7 +33,10 @@ async function trashAllTerms(taxonomy) {
   await visitAdminPage('edit-tags.php', `taxonomy=${taxonomy}`);
 
   // If this selector doesn't exist there are no terms for us to delete.
-  const bulkSelector = await page.$('#bulk-action-selector-top');
+  // The .hidden class is a new addition in WP 7.1, see http://core.trac.wordpress.org/ticket/63372.
+  const bulkSelector = await page.$(
+    '.bulkactions:not(.hidden) #bulk-action-selector-top'
+  );
   if (bulkSelector) {
     await page.waitForSelector('[id^=cb-select-all-]');
     await page.click('[id^=cb-select-all-]');
diff --git a/packages/e2e-tests/src/specs/wordpress/archive.js b/packages/e2e-tests/src/specs/wordpress/archive.js
index 1e1f4670c8fc..f12b978413e4 100644
--- a/packages/e2e-tests/src/specs/wordpress/archive.js
+++ b/packages/e2e-tests/src/specs/wordpress/archive.js
@@ -174,7 +174,6 @@ describe('Stories Archive', () => {
         await expect(page).toClick('button span', { text: 'Web Stories' });
 
         await page.waitForSelector('.web-stories-block-configuration-panel');
-        await expect(page).toClick('.web-stories-block-configuration-panel');
 
         await expect(page).toClick('button', { text: 'Latest Stories' });
         await expect(page).toClick('button', { text: 'Box Carousel' });
diff --git a/packages/e2e-tests/src/specs/wordpress/blockWidget.js b/packages/e2e-tests/src/specs/wordpress/blockWidget.js
index 984db1cab950..6609c84dc6a9 100644
--- a/packages/e2e-tests/src/specs/wordpress/blockWidget.js
+++ b/packages/e2e-tests/src/specs/wordpress/blockWidget.js
@@ -62,7 +62,6 @@ describe('Web Stories Widget Block', () => {
     await expect(page).toClick('button span', { text: 'Web Stories' });
 
     await page.waitForSelector('.web-stories-block-configuration-panel');
-    await expect(page).toClick('.web-stories-block-configuration-panel');
 
     await expect(page).toClick('button[aria-label="Embed a single story."]');