diff --git a/uc_cart/src/CheckoutPanePluginBase.php b/uc_cart/src/CheckoutPanePluginBase.php
index 1e3deee..dc1f537 100644
--- a/uc_cart/src/CheckoutPanePluginBase.php
+++ b/uc_cart/src/CheckoutPanePluginBase.php
@@ -111,4 +111,11 @@ abstract class CheckoutPanePluginBase extends PluginBase implements CheckoutPane
     return $this->pluginDefinition['title'];
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function calculateDependencies() {
+    return array();
+  }
+
 }
diff --git a/uc_cart/src/Entity/UcCartItem.php b/uc_cart/src/Entity/UcCartItem.php
index 274515b..cdc3b8e 100644
--- a/uc_cart/src/Entity/UcCartItem.php
+++ b/uc_cart/src/Entity/UcCartItem.php
@@ -127,9 +127,9 @@ class UcCartItem extends ContentEntityBase {
       ->setLabel(t('Changed'))
       ->setDescription(t('The Unix timestamp indicating the time the product in the cart was changed.'))
       ->setSetting('default_value', 0);
-//    $fields['data'] = FieldDefinition::create('string')
-//      ->setLabel(t('Data'))
-//      ->setDescription(t('A serialized array of extra data.'));
+    $fields['data'] = FieldDefinition::create('map')
+      ->setLabel(t('Data'))
+      ->setDescription(t('A serialized array of extra data.'));
 
     return $fields;
   }
diff --git a/uc_order/config/install/views.view.uc_order_history.yml b/uc_order/config/install/views.view.uc_order_history.yml
index 0f8698a..aeed16a 100644
--- a/uc_order/config/install/views.view.uc_order_history.yml
+++ b/uc_order/config/install/views.view.uc_order_history.yml
@@ -487,7 +487,7 @@ display:
     display_title: Page
     position: ''
     display_options:
-      path: user/%/orders
+      path: user/%user/orders
       menu:
         type: tab
         title: Orders
diff --git a/uc_order/src/Entity/UcOrder.php b/uc_order/src/Entity/UcOrder.php
index 71a5063..34e9222 100644
--- a/uc_order/src/Entity/UcOrder.php
+++ b/uc_order/src/Entity/UcOrder.php
@@ -583,9 +583,9 @@ class UcOrder extends ContentEntityBase implements UcOrderInterface {
       ->setDescription(t('The method of payment.'))
       ->setSetting('default_value', '')
       ->setSetting('max_length', 32);
-//    $fields['data'] = FieldDefinition::create('map')
-//      ->setLabel(t('Data'))
-//      ->setDescription(t('A serialized array of extra data.'));
+    $fields['data'] = FieldDefinition::create('map')
+      ->setLabel(t('Data'))
+      ->setDescription(t('A serialized array of extra data.'));
     $fields['created'] = FieldDefinition::create('integer')
       ->setLabel(t('Created'))
       ->setDescription(t('The Unix timestamp indicating when the order was created.'))
diff --git a/uc_order/uc_order.routing.yml b/uc_order/uc_order.routing.yml
index 55c72cb..390f650 100644
--- a/uc_order/uc_order.routing.yml
+++ b/uc_order/uc_order.routing.yml
@@ -96,10 +96,6 @@ uc_order.admin_log:
   requirements:
     _permission: 'view all orders'
 
-# This is required for Views to discover the correct argument name.
-view.uc_order_history.page_1:
-  path: '/user/{user}/orders'
-
 uc_order.user_view:
   path: '/user/{user}/orders/{uc_order}'
   defaults: