Fixes for ChoiceView and DetailView.