fixes for enrollment workflow