Walletmor and gateway issues

@amal, @wojtek

Anybody?