BB fixes for donation fixes