Rework use of nonces