Tweaked rng construction