Some more mime-chooser fixes