Enrolment fixes