Best patch for invalid nonce and duplicate share