Try to fix Ubi, per previous API changes.