more manager fixup.