Fixing some issues with the rng roll