xsd fixes