Some more shipment guide updates