Fixing ShipmentRequest so it actually validates