Fixes for Choicer