Fix issues 441, 442 and 443. Also added a bit more logging to enrolments