Randomizer fixes