diff --git a/delivery_stamps/__init__.py b/delivery_stamps/__init__.py
index 0650744f..09434554 100644
--- a/delivery_stamps/__init__.py
+++ b/delivery_stamps/__init__.py
@@ -1 +1,3 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
 from . import models
diff --git a/delivery_stamps/__manifest__.py b/delivery_stamps/__manifest__.py
index 9062f467..382e8d60 100644
--- a/delivery_stamps/__manifest__.py
+++ b/delivery_stamps/__manifest__.py
@@ -1,10 +1,12 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
 {
     'name': 'Stamps.com (USPS) Shipping',
     'summary': 'Send your shippings through Stamps.com and track them online.',
-    'version': '12.0.2.0.0',
+    'version': '13.0.1.0.0',
     'author': "Hibou Corp.",
     'category': 'Warehouse',
-    'license': 'AGPL-3',
+    'license': 'OPL-1',
     'images': [],
     'website': "https://hibou.io",
     'description': """
diff --git a/delivery_stamps/models/__init__.py b/delivery_stamps/models/__init__.py
index d675855d..1f944aa8 100644
--- a/delivery_stamps/models/__init__.py
+++ b/delivery_stamps/models/__init__.py
@@ -1 +1,3 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
 from . import delivery_stamps
diff --git a/delivery_stamps/models/delivery_stamps.py b/delivery_stamps/models/delivery_stamps.py
index 4f8c0bf1..c9a1829d 100644
--- a/delivery_stamps/models/delivery_stamps.py
+++ b/delivery_stamps/models/delivery_stamps.py
@@ -1,3 +1,5 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
 import hashlib
 from datetime import date
 from logging import getLogger
@@ -158,8 +160,8 @@ class ProviderStamps(models.Model):
 
         ret_val = service.create_shipping()
         ret_val.ShipDate = date_planned.strftime('%Y-%m-%d') if date_planned else date.today().isoformat()
-        ret_val.FromZIPCode = shipper.zip.split('-')[0]
-        ret_val.ToZIPCode = recipient.zip.split('-')[0]
+        ret_val.From = self._stamps_address(service, shipper)
+        ret_val.To = self._stamps_address(service, recipient)
         ret_val.PackageType = self._stamps_package_type()
         ret_val.WeightLb = weight
         ret_val.ContentType = 'Merchandise'
diff --git a/delivery_stamps/views/delivery_stamps_view.xml b/delivery_stamps/views/delivery_stamps_view.xml
index 88e1f648..4320c0e2 100644
--- a/delivery_stamps/views/delivery_stamps_view.xml
+++ b/delivery_stamps/views/delivery_stamps_view.xml
@@ -32,7 +32,7 @@
         <field name="model">product.packaging</field>
         <field name="inherit_id" ref="delivery.product_packaging_delivery_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='max_weight']" position='after'>
+            <xpath expr="//field[@name='length']" position='after'>
                 <field name="stamps_cubic_pricing"/>
             </xpath>
         </field>