Hot patch to fix legacy xml issues