diff --git a/Tools/XMLSchema/FrameworkDataAttributes.xsd b/Tools/XMLSchema/FrameworkDataAttributes.xsd
index aedfc86885..bae4d784ff 100644
--- a/Tools/XMLSchema/FrameworkDataAttributes.xsd
+++ b/Tools/XMLSchema/FrameworkDataAttributes.xsd
@@ -37,7 +37,7 @@
   </xs:attributeGroup>
   <xs:attributeGroup name="EventAttributes">
     <xs:attribute name="Usage" type="EventUsage" use="required"/>
-    <xs:attribute name="EventGuidCName" type="C_NameType" use="required"/>
+    <xs:attribute name="EventGuidCName" type="C_NameType" use="optional"/>
     <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>
     <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>
   </xs:attributeGroup>
diff --git a/Tools/XMLSchema/FrameworkDataElements.xsd b/Tools/XMLSchema/FrameworkDataElements.xsd
index 21dfda0c6a..d9dedbe86a 100644
--- a/Tools/XMLSchema/FrameworkDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkDataElements.xsd
@@ -515,14 +515,14 @@
   <xs:element name="ModuleBuildOptions">
     <xs:complexType>
       <xs:sequence>
-        <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax" namespace="##local"/>
+        <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
   <xs:element name="ModuleSaBuildOptions">
     <xs:complexType>
       <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="1" name="FvBinding" type="KeywordType"/>
+        <xs:element minOccurs="0" maxOccurs="1" name="FvBinding" type="KeywordList"/>
         <!-- The FfsFileNameGuid allows the Platform Integrator to specify a GUID for the FFS File Name GUID -->
         <xs:element minOccurs="0" maxOccurs="1" name="FfsFileNameGuid" type="GuidType"/>
         <!-- If binding is specified, you MUST specify the FfsFormatKey -->
@@ -549,7 +549,7 @@
                     <xs:element minOccurs="1" maxOccurs="1" name="ModuleVersion" type="VersionDataType"/>
                   </xs:sequence>
                   <!-- The Id is a number used to track heritage  the first entry will be 0 and increment from then on. -->
-                  <xs:attribute name="Id" type="xs:nonNegativeInteger" use="optional"/>
+                  <xs:attribute name="Id" type="xs:nonNegativeInteger" use="required"/>
                   <!-- If the original module was installed from a FAR, track the FAR it came from. -->
                   <xs:attribute name="FarGuid" type="GuidType" use="optional"/>
                 </xs:complexType>
@@ -608,7 +608,7 @@
                     <xs:element minOccurs="1" maxOccurs="1" name="PackageVersion" type="VersionDataType"/>
                   </xs:sequence>
                   <!-- The Id is a number used to track heritage  the first entry will be 0 and increment from then on. -->
-                  <xs:attribute name="Id" type="xs:nonNegativeInteger" use="optional"/>
+                  <xs:attribute name="Id" type="xs:nonNegativeInteger" use="required"/>
                   <!-- If the original Package was installed from a FAR, track the FAR it came from. -->
                   <xs:attribute name="FarGuid" type="GuidType" use="optional"/>
                 </xs:complexType>
diff --git a/Tools/XMLSchema/NamingConvention.xsd b/Tools/XMLSchema/NamingConvention.xsd
index ce477cc59d..936b6f2741 100644
--- a/Tools/XMLSchema/NamingConvention.xsd
+++ b/Tools/XMLSchema/NamingConvention.xsd
@@ -109,6 +109,12 @@
       <xs:pattern value="0x[a-fA-F0-9]{1,4}"/>
     </xs:restriction>
   </xs:simpleType>
+  <xs:simpleType name="KeywordList">
+    <xs:restriction base="xs:string">
+      <xs:minLength value="1"/>
+      <xs:pattern value="[a-zA-Z]+(\ *_*[a-zA-Z0-9]*)*"/>
+    </xs:restriction>
+  </xs:simpleType>
   <xs:simpleType name="KeywordType">
     <xs:restriction base="xs:normalizedString">
       <xs:pattern value="[a-zA-Z]+(_*[a-zA-Z0-9]*)*"/>
diff --git a/Tools/XMLSchema/SurfaceArea.xsd b/Tools/XMLSchema/SurfaceArea.xsd
index 97104e6bf5..74769d4c8f 100644
--- a/Tools/XMLSchema/SurfaceArea.xsd
+++ b/Tools/XMLSchema/SurfaceArea.xsd
@@ -119,7 +119,7 @@
                     <xs:element minOccurs="1" maxOccurs="1" name="PlatformVersion" type="VersionDataType"/>
                   </xs:sequence>
                   <!-- The Id is a number used to track heritage  the first entry will be 0 and increment from then on. -->
-                  <xs:attribute name="Id" type="xs:nonNegativeInteger" use="optional"/>
+                  <xs:attribute name="Id" type="xs:nonNegativeInteger" use="required"/>
                   <!-- If the original module was installed from a FAR, track the FAR it came from. -->
                   <xs:attribute name="FarGuid" type="GuidType" use="optional"/>
                 </xs:complexType>