Customer & Delivery fix.