Several bugfixes in donations
Merge branch 'master' into staging