Minor update to ensure generated XML is valid