Further waypoint decoding changes