Fund and Wallet validation updated