Apply newer vxlan patch to tht
Fix typos