small changes to fix validation issues in the XSD