Small enroll fixes