More drone fixes