Some fixes for the XML format change