Some Fixes for Drone target selection