Fixed Waypoint import.