Some fixes to the xml file