Randomization defect fixes