diff --git a/core/modules/views/src/Entity/View.php b/core/modules/views/src/Entity/View.php
index f7860a7..05bc393 100644
--- a/core/modules/views/src/Entity/View.php
+++ b/core/modules/views/src/Entity/View.php
@@ -10,7 +10,6 @@
 use Drupal\Component\Utility\NestedArray;
 use Drupal\Core\Config\Entity\ConfigEntityBase;
 use Drupal\Core\Entity\EntityStorageInterface;
-use Drupal\migrate\Plugin\migrate\process\Iterator;
 use Drupal\views\Views;
 use Drupal\views\ViewEntityInterface;
 
diff --git a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
index d22caf4..2ff7738 100644
--- a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
+++ b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
@@ -900,7 +900,7 @@ protected function getAllHandlers($only_overrides = FALSE) {
    * @param bool $only_overrides
    *   Whether to include only overridden plugins.
    *
-   * @return \Drupal\views\Plugin\views\ViewsHandlerInterface[]
+   * @return \Drupal\views\Plugin\views\ViewsPluginInterface[]
    */
   protected function getAllPlugins($only_overrides = FALSE) {
     $plugins = [];
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_dependency.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_dependency.yml
index faba7df..9b8ac57 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_dependency.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_dependency.yml
@@ -225,8 +225,6 @@ display:
     position: 1
     display_options:
       display_extenders: {  }
-      field_langcode: '***LANGUAGE_language_content***'
-      field_langcode_add_to_query: null
       path: test_argument_dependency
       style:
         type: default
@@ -303,7 +301,7 @@ display:
             suffix: ''
             target: ''
             nl2br: false
-            max_length: ''
+            max_length: 0
             word_boundary: true
             ellipsis: true
             more_link: false
@@ -331,8 +329,8 @@ display:
           group_column: value
           group_columns: {  }
           group_rows: true
-          delta_limit: all
-          delta_offset: '0'
+          delta_limit: 0
+          delta_offset: 0
           delta_reversed: false
           delta_first_last: false
           multi_type: separator