Waypoint Loiter N bug fixes