Other xml file fixes