Choice bug fixes