Donation code cleanup and fixes