Fixup (s/group/instance)