Waypoint fixes