Fix nonce builder