Clean up

Bunch of fixes to the donor flow