RNG improvements