More fixes for GPU RNG Modularity