Donor Asay and drone fixes