Pulled in Avis control waypoint fix.