PRNG corrections after overhaul merge