Fix compilation after xy- branch