Fixes for payments and donations.
Merge pull request #545 from benkonrath/payment-donation-fixes

Fixes for payments and donations.