Add back some chooser changes accidentally left out in last conflict merge