Bug fixes in encap and vxlan identifier change