xsd-wfs fixes