diff --git a/addons/dine360_theme_chennora/views/checkout_address.xml b/addons/dine360_theme_chennora/views/checkout_address.xml
index 7fbf8b6..5c8ca2b 100644
--- a/addons/dine360_theme_chennora/views/checkout_address.xml
+++ b/addons/dine360_theme_chennora/views/checkout_address.xml
@@ -23,8 +23,8 @@
 
     <!-- Custom Checkout Page Logic -->
     <template id="chennora_checkout_custom" inherit_id="website_sale.checkout" name="Chennora Checkout Custom" priority="99">
-        <!-- Add error banner before the navigation buttons -->
-        <xpath expr="//t[@t-call='website_sale.navigation_buttons']" position="before">
+        <!-- Add error banner after the Address header -->
+        <xpath expr="//h3" position="after">
             <div id="uber_error" class="alert alert-danger d-none my-3" role="alert"></div>
         </xpath>
 
diff --git a/addons/dine360_uber/models/sale_order.py b/addons/dine360_uber/models/sale_order.py
index 3b5c6d8..2ba4f3f 100644
--- a/addons/dine360_uber/models/sale_order.py
+++ b/addons/dine360_uber/models/sale_order.py
@@ -41,6 +41,15 @@ class SaleOrder(models.Model):
                     'product_uom_qty': 1,
                 })]})
             
+            # Satisfy Odoo's shipping requirement by setting a carrier if none is set
+            if not self.carrier_id:
+                Carrier = self.env['delivery.carrier'].sudo()
+                # Try to find an 'Uber' carrier first, then fall back to any active one
+                carrier = Carrier.search([('name', 'ilike', 'uber')], limit=1) or Carrier.search([], limit=1)
+                if carrier:
+                    _logger.info("Uber: Linking order to carrier %s", carrier.name)
+                    self.write({'carrier_id': carrier.id})
+            
             # Recalculate taxes and totals
             self._amount_all()
         else: