diff --git a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/PrimitiveTypeConstraintValidator.php b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/PrimitiveTypeConstraintValidator.php
index da0c9a7..0f57e32 100644
--- a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/PrimitiveTypeConstraintValidator.php
+++ b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/PrimitiveTypeConstraintValidator.php
@@ -67,9 +67,6 @@ public function validate($value, Constraint $constraint) {
     }
 
     if (!$valid) {
-      debug($value);
-      /** @var \Drupal\Core\TypedData\TypedDataInterface $typed_data */
-      debug($typed_data->getPropertyPath());
       // @todo: Provide a good violation message for each problem.
       $this->context->addViolation($constraint->message, array(
         '%value' => is_object($value) ? get_class($value) : (is_array($value) ? 'Array' : (string) $value)
diff --git a/core/modules/comment/src/Tests/CommentStringIdEntitiesTest.php b/core/modules/comment/src/Tests/CommentStringIdEntitiesTest.php
index a81b949..3c3a000 100644
--- a/core/modules/comment/src/Tests/CommentStringIdEntitiesTest.php
+++ b/core/modules/comment/src/Tests/CommentStringIdEntitiesTest.php
@@ -28,6 +28,7 @@ class CommentStringIdEntitiesTest extends KernelTestBase {
     'field',
     'field_ui',
     'entity',
+    'entity_reference',
     'entity_test',
     'text',
   );
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceWidgetSettings.php b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceWidgetSettings.php
index 10dc015..df90a6b 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceWidgetSettings.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceWidgetSettings.php
@@ -59,6 +59,7 @@ public function getSettings($widget_type, $widget_settings) {
         'placeholder' => '',
       ),
       'email_textfield' => array(
+        'size' => $size,
         'placeholder' => '',
       ),
       'link' => array(