Fixup for api changeover