Update chosen dependency. Fixes #182
Robustify enrolling