Some changes to AmbiguousNode