export shipment fixes