Fixes to formatting wallet and extra HasWallet check