Fixes for the chooser