[ChoiceBox] fix some compatibility issues.