diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityBundleBase.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBundleBase.php
index 6351d14..ed1fda1 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityBundleBase.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBundleBase.php
@@ -201,7 +201,7 @@ protected function getPluralIndex($count) {
     // the service does not exist. For example, where the parent test site has
     // locale installed but the child site does not.
     // @todo Refactor in https://www.drupal.org/node/2660338 so this code does
-    // not depend on knowing that the Locale module exists.
+    //   not depend on knowing that the Locale module exists.
     if (function_exists('locale_get_plural') && \Drupal::hasService('locale.plural.formula')) {
       return locale_get_plural($count);
     }
diff --git a/core/modules/node/src/NodeTypeForm.php b/core/modules/node/src/NodeTypeForm.php
index 6fdb437..0014070 100644
--- a/core/modules/node/src/NodeTypeForm.php
+++ b/core/modules/node/src/NodeTypeForm.php
@@ -325,7 +325,7 @@ protected function getPluralVariantLabel($plurals, $delta) {
   protected function getPluralVariantDefaultValue($delta) {
     static $label_count;
 
-    /** @var \Drupal\node\Entity\NodeType $type */
+    /** @var \Drupal\node\NodeTypeInterface $type */
     $type = $this->getEntity();
 
     if (!isset($label_count)) {
diff --git a/core/modules/node/tests/src/Functional/NodeTypePluralLabelsTranslationTest.php b/core/modules/node/tests/src/Functional/NodeTypePluralLabelsTranslationTest.php
index b369a4f..a420960 100644
--- a/core/modules/node/tests/src/Functional/NodeTypePluralLabelsTranslationTest.php
+++ b/core/modules/node/tests/src/Functional/NodeTypePluralLabelsTranslationTest.php
@@ -96,7 +96,7 @@ public function testNodeTypeTranslation() {
     ];
     $this->drupalPostForm('admin/structure/types/manage/child/translate/en/add', $edit, t('Save translation'));
 
-    /** @var \Drupal\node\Entity\NodeType $node_type */
+    /** @var \Drupal\node\NodeTypeInterface $node_type */
     $node_type = NodeType::load('child');
 
     // Check that the default language (Romanian) original labels were stored.
@@ -110,7 +110,7 @@ public function testNodeTypeTranslation() {
     // Load the English version of the 'child' node-type.
     $original_language = $language_manager->getConfigOverrideLanguage();
     $language_manager->setConfigOverrideLanguage(ConfigurableLanguage::load('en'));
-    /** @var \Drupal\node\Entity\NodeType $node_type */
+    /** @var \Drupal\node\NodeTypeInterface $node_type */
     $node_type = NodeType::load('child');
     $language_manager->setConfigOverrideLanguage($original_language);
 
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index df986ef..f34d6b7 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -1424,7 +1424,7 @@ function system_entity_type_alter(array &$entity_types) {
   $typed_config_manager = \Drupal::service('config.typed');
 
   /** @var \Drupal\Core\Entity\EntityTypeInterface[] $entity_types */
-  foreach ($entity_types as $entity_type_id => &$entity_type) {
+  foreach ($entity_types as $entity_type_id => $entity_type) {
     // Automatically add label_singular, label_plural, label_count properties to
     // config_export annotation list for bundle entity types that support label
     // plural variants. The check is performed by inspecting the bundle entity