Pulling Avis waypoint logic fixes.