Fix up nonce expectations