diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/IntegerBigItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/IntegerBigItem.php
new file mode 100644
index 0000000..670db2b
--- /dev/null
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/IntegerBigItem.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Field\Plugin\Field\FieldType\IntegerBigItem.
+ */
+
+namespace Drupal\Core\Field\Plugin\Field\FieldType;
+
+use Drupal\Core\Field\FieldStorageDefinitionInterface;
+
+/**
+ * Defines the 'integer_big' field type.
+ *
+ * @FieldType(
+ *   id = "integer_big",
+ *   label = @Translation("Number (integer big)"),
+ *   description = @Translation("This field stores a number in the database as a big integer."),
+ *   default_widget = "number",
+ *   default_formatter = "number_integer"
+ * )
+ */
+class IntegerBigItem extends IntegerItem {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function schema(FieldStorageDefinitionInterface $field_definition) {
+    return array(
+      'columns' => array(
+        'value' => array(
+          'type' => 'int',
+          'size' => 'big',
+          'not null' => FALSE,
+          // Expose the 'unsigned' setting in the field item schema.
+          'unsigned' => $field_definition->getSetting('unsigned'),
+        ),
+      ),
+    );
+  }
+
+}
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/UriItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/UriItem.php
index 693e4ce..dbef995 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/UriItem.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/UriItem.php
@@ -52,7 +52,8 @@ public static function schema(FieldStorageDefinitionInterface $field_definition)
     return array(
       'columns' => array(
         'value' => array(
-          'type' => 'text',
+          'type' => 'varchar',
+          'length' => (int) $field_definition->getSetting('max_length'),
           'not null' => TRUE,
         ),
       ),
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlock.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlock.php
index 5c1dc69..585026e 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlock.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlock.php
@@ -187,7 +187,7 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
       ->setSetting('target_type', 'custom_block_type')
       ->setSetting('max_length', EntityTypeInterface::BUNDLE_MAX_LENGTH);
 
-    $fields['log'] = FieldDefinition::create('string')
+    $fields['log'] = FieldDefinition::create('string_long')
       ->setLabel(t('Revision log message'))
       ->setDescription(t('The revision log message.'))
       ->setRevisionable(TRUE);
diff --git a/core/modules/file/lib/Drupal/file/Entity/File.php b/core/modules/file/lib/Drupal/file/Entity/File.php
index 39f27d6..df31513 100644
--- a/core/modules/file/lib/Drupal/file/Entity/File.php
+++ b/core/modules/file/lib/Drupal/file/Entity/File.php
@@ -255,12 +255,12 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
       ->setLabel(t('File MIME type'))
       ->setDescription(t("The file's MIME type."));
 
-    $fields['filesize'] = FieldDefinition::create('integer')
+    $fields['filesize'] = FieldDefinition::create('integer_big')
       ->setLabel(t('File size'))
       ->setDescription(t('The size of the file in bytes.'))
       ->setSetting('unsigned', TRUE);
 
-    $fields['status'] = FieldDefinition::create('integer')
+    $fields['status'] = FieldDefinition::create('boolean')
       ->setLabel(t('Status'))
       ->setDescription(t('The status of the file, temporary (0) and permanent (1).'));