Fixes for donations. Fixes for tests.