Fix issues with xml file