Drone fixes