Huge fixes in xml files