Be careful with RNG state in a few more places (wheals)