diff --git a/core/modules/media_library/config/install/core.entity_view_mode.media.media_library.yml b/core/modules/media_library/config/optional/core.entity_view_mode.media.media_library.yml
similarity index 100%
rename from core/modules/media_library/config/install/core.entity_view_mode.media.media_library.yml
rename to core/modules/media_library/config/optional/core.entity_view_mode.media.media_library.yml
diff --git a/core/modules/media_library/config/install/views.view.media_library.yml b/core/modules/media_library/config/optional/views.view.media_library.yml
similarity index 100%
rename from core/modules/media_library/config/install/views.view.media_library.yml
rename to core/modules/media_library/config/optional/views.view.media_library.yml
diff --git a/core/modules/media_library/src/Plugin/views/field/SelectMedia.php b/core/modules/media_library/src/Plugin/views/field/SelectMedia.php
index 9b01e48..4b18a39 100644
--- a/core/modules/media_library/src/Plugin/views/field/SelectMedia.php
+++ b/core/modules/media_library/src/Plugin/views/field/SelectMedia.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\media_library\Plugin\views\field\SelectEntity.
- */
-
 namespace Drupal\media_library\Plugin\views\field;
 
 use Drupal\Core\Ajax\AjaxResponse;
@@ -13,7 +8,7 @@
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Render\Element;
 use Drupal\Core\Url;
-use Drupal\system\Plugin\views\field\SelectFormBase;
+use Drupal\views\Plugin\views\field\SelectFormBase;
 
 /**
  * Provides a field for selecting media entities in our media library view.