Fixup for newer versions of active stuff.