Improve nonce verification