Enrollment fixes