Fixes for "Choice".