Couple more bugs with randoms.