fixes to pair roulette flow