Replace CUICategoryMarking/CUICategoryCodeType objects with two simple content objects, one for Specified category markings and one for Basic category markings. This will affect both the Document metadata type and the Portion metadata types.
For CUILimitedDisseminationControlRELTOCountryCode, replace iso_3166:CountryAlpha3CodeType with genc:CountryAlpha3CodeType.
Change date type for Code lists from xs:string to xs:token.