Some tweaks to the XML