minor glitches after xsd merge