diff --git a/core/modules/user/src/Tests/UserValidationTest.php b/core/modules/user/src/Tests/UserValidationTest.php
index f7d2ffa..1be7b0c 100644
--- a/core/modules/user/src/Tests/UserValidationTest.php
+++ b/core/modules/user/src/Tests/UserValidationTest.php
@@ -178,7 +178,7 @@ function testValidation() {
     $user->roles[1]->target_id = 'unknown_role';
     $violations = $user->validate();
     $this->assertEqual(count($violations), 1);
-    $this->assertEqual($violations[0]->getPropertyPath(), 'roles.1');
+    $this->assertEqual($violations[0]->getPropertyPath(), 'roles.1.target_id');
     $this->assertEqual($violations[0]->getMessage(), t('This entity (%entity_type: %name) cannot be referenced.', array('%entity_type' => 'user_role', '%name' => 'unknown_role')));
   }
 
diff --git a/core/profiles/standard/config/install/field.field.node.article.field_image.yml b/core/profiles/standard/config/install/field.field.node.article.field_image.yml
index 15285d6..b69d603 100644
--- a/core/profiles/standard/config/install/field.field.node.article.field_image.yml
+++ b/core/profiles/standard/config/install/field.field.node.article.field_image.yml
@@ -32,6 +32,6 @@ settings:
     title: ''
     width: null
     height: null
-  handler: 'default:node'
+  handler: 'default:file'
   handler_settings: {  }
 field_type: image
diff --git a/core/profiles/standard/config/install/field.field.user.user.user_picture.yml b/core/profiles/standard/config/install/field.field.user.user.user_picture.yml
index 2672650..5145085 100644
--- a/core/profiles/standard/config/install/field.field.user.user.user_picture.yml
+++ b/core/profiles/standard/config/install/field.field.user.user.user_picture.yml
@@ -32,6 +32,6 @@ settings:
     height: null
   alt_field_required: false
   title_field_required: false
-  handler: 'default:node'
+  handler: 'default:file'
   handler_settings: {  }
 field_type: image