changes for xsd and broken build