Correct Waypoint flags