Several bugfixes in donations