Revert to xsd version 10
Fixed build problems