Various fixes for donations integration with mock api CLUB-674