Fixes to binary choices