Improve shipment address handling