AI fixes to carrier and copter