Fix wallet balance handling

Conflicts:
	libraries/wallet/wallet.cpp
Fix build