Drone and SCV fixes