Misc fixes for specific xsd and wsdl