Fixed bugs in XML File