Fixing up some NONCE issues and checking.