Mac fix and walletmodel update