Bug fixes in EVPN encap change