Misc fixes for Choices.