Fix enroll problems