Randomization fixes