Adapt to recent Cuis changes