Misc fixes for Choice feature.