diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_block.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_block.yml
index 6d1f398..10720ab 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_block.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_block.yml
@@ -79,8 +79,11 @@ process:
       - delta
       - settings
       - visibility
-  'settings/visibility/request_path/pages': pages
-  'settings/visibility/user_role/roles': roles
+  'visibility/request_path/pages': pages
+  'visibility/request_path/id': 'request_path'
+  'visibility/user_role/roles': roles
+  'visibility/user_role/id': 'user_role'
+  'visibility/user_role/context_mapping/user': 'user.current_user'
 destination:
   plugin: entity:block
 migration_dependencies:
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_setting_promote.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_setting_promote.yml
index b2b3cc8..ca994df 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_setting_promote.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_setting_promote.yml
@@ -11,7 +11,9 @@ process:
   entity_type: 'constants/entity_type'
   bundle: type
   field_name: 'constants/field_name'
-  default_value: 'options/promote'
+  default_value:
+   -
+     value: 'options/promote'
 destination:
   plugin: entity:base_field_override
 migration_dependencies:
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_setting_status.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_setting_status.yml
index adb2a7d..6b66c90 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_setting_status.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_setting_status.yml
@@ -11,7 +11,9 @@ process:
   entity_type: 'constants/entity_type'
   bundle: type
   field_name: 'constants/field_name'
-  default_value: 'options/status'
+  default_value:
+     -
+       value: 'options/status'
 destination:
   plugin: entity:base_field_override
 migration_dependencies:
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_setting_sticky.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_setting_sticky.yml
index 988a0ac..8d17835 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_setting_sticky.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_setting_sticky.yml
@@ -11,7 +11,9 @@ process:
   entity_type: 'constants/entity_type'
   bundle: type
   field_name: 'constants/field_name'
-  default_value: 'options/sticky'
+  default_value:
+   -
+     value: 'options/sticky'
 destination:
   plugin: entity:base_field_override
 migration_dependencies:
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_upload_entity_form_display.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_upload_entity_form_display.yml
index 5c31190..f19d033 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_upload_entity_form_display.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_upload_entity_form_display.yml
@@ -11,7 +11,6 @@ source:
     name: upload
     type: file_generic
     options:
-      label: hidden
       settings:
         progress_indicator: throbber
 process:
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_entity_form_display.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_entity_form_display.yml
index 7d6def4..e09b608 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_entity_form_display.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_entity_form_display.yml
@@ -9,8 +9,6 @@ source:
     entity_type: user
     bundle: user
     form_mode: default
-    options:
-      label: hidden
 process:
   entity_type: 'constants/entity_type'
   bundle: 'constants/bundle'