Adapt SO to RO schema changes

No match.