Some randomizer improvements.