Wallet2 improvements