Enroll fixes

For the change list please refer to individual commit notes.