Fixup for instance management