#4 ShipFrom corrections