Fix choices according to specs