Some more changes to the XML files