Minor changes related to the XMLTool