diff --git a/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldInterface.php b/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldInterface.php
index 608b0af..142ed97 100644
--- a/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldInterface.php
+++ b/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldInterface.php
@@ -5,7 +5,8 @@
 
 /**
  * Provides an interface for all field type plugins.
+ *
+ * @deprecated in Drupal 8.2.x, to be removed in Drupal 9.0.x. Use
+ *   \Drupal\migrate_drupal\Annotation\MigrateField instead.
  */
-interface MigrateCckFieldInterface extends MigrateFieldInterface {
-
-}
+interface MigrateCckFieldInterface extends MigrateFieldInterface { }
diff --git a/core/modules/migrate_drupal/src/Plugin/MigrateFieldPluginManager.php b/core/modules/migrate_drupal/src/Plugin/MigrateFieldPluginManager.php
index 826f258..d68dd68 100644
--- a/core/modules/migrate_drupal/src/Plugin/MigrateFieldPluginManager.php
+++ b/core/modules/migrate_drupal/src/Plugin/MigrateFieldPluginManager.php
@@ -35,10 +35,8 @@ public function createInstance($field_type, array $configuration = array(), Migr
       $core = $configuration['core'];
     }
     elseif (!empty($migration->getPluginDefinition()['migration_tags'])) {
-      foreach ($migration->getPluginDefinition()['migration_tags'] as $tag) {
-        if ($tag == 'Drupal 7') {
-          $core = 7;
-        }
+      if (in_array('Drupal 7', $migration->getPluginDefinition()['migration_tags'])) {
+        $core = 7;
       }
     }
 
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/FieldMigration.php b/core/modules/migrate_drupal/src/Plugin/migrate/FieldMigration.php
index 4157318..cf2e40d 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/FieldMigration.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/FieldMigration.php
@@ -12,7 +12,7 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
- * Migration plugin class for migrations dealing with field values.
+ * Migration plugin class for migrations dealing with field config and values.
  */
 class FieldMigration extends Migration implements ContainerFactoryPluginInterface {
 
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/CckFieldPluginBase.php b/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/CckFieldPluginBase.php
index 6e3e7e3..f0fbbfe 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/CckFieldPluginBase.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/CckFieldPluginBase.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\migrate_drupal\Plugin\migrate\cckfield;
 
-use Drupal\views\Plugin\views\field\FieldPluginBase;
+use Drupal\migrate_drupal\Plugin\migrate\field\FieldPluginBase;
 
 /**
  * The base class for all field plugins.
diff --git a/core/modules/migrate_drupal/tests/src/Kernel/MigrateFieldPluginManagerTest.php b/core/modules/migrate_drupal/tests/src/Kernel/MigrateFieldPluginManagerTest.php
index 9603f67..040b6cb 100644
--- a/core/modules/migrate_drupal/tests/src/Kernel/MigrateFieldPluginManagerTest.php
+++ b/core/modules/migrate_drupal/tests/src/Kernel/MigrateFieldPluginManagerTest.php
@@ -20,7 +20,7 @@ class MigrateFieldPluginManagerTest extends MigrateDrupalTestBase {
    * Tests that the correct MigrateField plugins are used.
    */
   public function testPluginSelection() {
-    $plugin_manager = \Drupal::service('plugin.manager.migrate.field');
+    $plugin_manager = $this->container->get('plugin.manager.migrate.field');
 
     $this->assertIdentical('Drupal\\file\\Plugin\\migrate\\field\\d6\\FileField', get_class($plugin_manager->createInstance('filefield', ['core' => 6])));