fixes for enrollment process