[Wallet] Watch-only fixes