Activity manager enrolment fixes (WIP)