[FOLLOWUP] fixes in xml generation