diff --git a/uc_order/lib/Drupal/uc_order/Entity/UcOrder.php b/uc_order/lib/Drupal/uc_order/Entity/UcOrder.php
index 5e4fe55..a907430 100644
--- a/uc_order/lib/Drupal/uc_order/Entity/UcOrder.php
+++ b/uc_order/lib/Drupal/uc_order/Entity/UcOrder.php
@@ -473,7 +473,7 @@ class UcOrder extends ContentEntityBase implements UcOrderInterface {
       ->setLabel(t('Order status'))
       ->setDescription(t('The uc_order_status entity ID indicating the order status'))
       ->setSetting('target_type', 'uc_order_status');
-    $fields['order_total'] = FieldDefinition::create('integer') // float?
+    $fields['order_total'] = FieldDefinition::create('float')
       ->setLabel(t('Order total'))
       ->setDescription(t('The total amount to be paid for the order.'));
     $fields['product_count'] = FieldDefinition::create('integer')
@@ -545,7 +545,7 @@ class UcOrder extends ContentEntityBase implements UcOrderInterface {
     $fields['payment_method'] = FieldDefinition::create('string')
       ->setLabel(t('Payment method'))
       ->setDescription(t('The method of payment.'));
-//    $fields['data'] = FieldDefinition::create('string')
+//    $fields['data'] = FieldDefinition::create('map')
 //      ->setLabel(t('Data'))
 //      ->setDescription(t('A serialized array of extra data.'));
     $fields['created'] = FieldDefinition::create('integer')
diff --git a/uc_order/lib/Drupal/uc_order/Entity/UcOrderProduct.php b/uc_order/lib/Drupal/uc_order/Entity/UcOrderProduct.php
index ed2341e..3b39784 100644
--- a/uc_order/lib/Drupal/uc_order/Entity/UcOrderProduct.php
+++ b/uc_order/lib/Drupal/uc_order/Entity/UcOrderProduct.php
@@ -85,19 +85,19 @@ class UcOrderProduct extends ContentEntityBase implements UcOrderProductInterfac
     $fields['qty'] = FieldDefinition::create('integer')
       ->setLabel(t('Quantity'))
       ->setDescription('The number of the product ordered.');
-    $fields['cost'] = FieldDefinition::create('integer') // float?
+    $fields['cost'] = FieldDefinition::create('float')
       ->setLabel(t('Cost'))
       ->setDescription('The cost to the store for the product.');
-    $fields['price'] = FieldDefinition::create('integer') // float?
+    $fields['price'] = FieldDefinition::create('float')
       ->setLabel(t('Price'))
       ->setDescription('The price paid for the ordered product.');
-    $fields['weight'] = FieldDefinition::create('integer') // float?
+    $fields['weight'] = FieldDefinition::create('float')
       ->setLabel(t('Weight'))
       ->setDescription('The physical weight.');
     $fields['weight_units'] = FieldDefinition::create('string')
       ->setLabel(t('Weight units'))
       ->setDescription('Unit of measure for the weight field.');
-//    $fields['data'] = FieldDefinition::create('string')
+//    $fields['data'] = FieldDefinition::create('map')
 //      ->setLabel(t('Data'))
 //      ->setDescription('A serialized array of extra data.');