Fix XML files to pass validation