XSD Fixes