diff --git a/schema/lib/types/gpg.xsd b/schema/lib/types/gpg.xsd
index 55198cc..1c8e2c0 100644
--- a/schema/lib/types/gpg.xsd
+++ b/schema/lib/types/gpg.xsd
@@ -6,19 +6,12 @@
     <xs:include schemaLocation="./net.xsd"/>
     <xs:include schemaLocation="./std.xsd"/>
 
-    <xs:complexType name="t_gpg_keys">
-        <xs:choice minOccurs="1" maxOccurs="unbounded">
-            <xs:element name="keyID" minOccurs="0" maxOccurs="unbounded" type="t_gpg_key_id"/>
-            <xs:element name="keyFile" minOccurs="0" maxOccurs="unbounded" type="t_net_generic_resource"/>
-        </xs:choice>
-    </xs:complexType>
-
     <xs:simpleType name="t_gpg_key_id">
         <xs:restriction base="xs:string">
             <xs:pattern value="(auto|default)"/><!-- Program should accept any key IDs it finds (INSECURE) -->
             <xs:pattern value="\s*(0x)?[0-9A-Fa-f]{40}\s*"/><!-- Full key ID -->
-            <xs:pattern value="\s*(0x)?[0-9A-Fa-f]{16}\s*"/><!-- Shorthand key ID -->
-            <xs:pattern value="\s*(0x)?[0-9A-Fa-f]{8}\s*"/><!-- Legacy shorter shorthand -->
+            <xs:pattern value="\s*(0x)?[0-9A-Fa-f]{16}\s*"/><!-- Shorthand key ID ("keyid-format long") -->
+            <xs:pattern value="\s*(0x)?[0-9A-Fa-f]{8}\s*"/><!-- Legacy shorter shorthand ("keyid-format short") -->
             <xs:pattern value="\s*([0-9A-Fa-f ]{4}){5} ?([0-9A-Fa-f ]{4}){4}[0-9A-Fa-f]{4}\s*"/><!-- Fingerprint -->
             <xs:whiteSpace value="collapse"/>
         </xs:restriction>
@@ -28,6 +21,13 @@
         <xs:union memberTypes="t_gpg_key_id t_net_email_addr"/>
     </xs:simpleType>
 
+    <xs:complexType name="t_gpg_keys">
+        <xs:choice minOccurs="1" maxOccurs="unbounded">
+            <xs:element name="keyID" minOccurs="0" maxOccurs="unbounded" type="t_gpg_key_id"/>
+            <xs:element name="keyFile" minOccurs="0" maxOccurs="unbounded" type="t_net_generic_resource"/>
+        </xs:choice>
+    </xs:complexType>
+
     <xs:simpleType name="t_gpg_sig">
         <xs:restriction base="xs:string">
             <xs:whiteSpace value="preserve"/>
@@ -36,7 +36,7 @@
 
     <xs:complexType name="t_gpg_verify">
         <xs:choice minOccurs="1" maxOccurs="unbounded">
-            <xs:element name="sigs">
+            <xs:element name="sigs" minOccurs="1" maxOccurs="unbounded">
                 <xs:complexType>
                     <xs:choice minOccurs="1" maxOccurs="unbounded">
                         <xs:element name="signature" minOccurs="0" maxOccurs="unbounded" type="t_gpg_sig"/>