Fix CE APIs for unification