diff --git a/lib/schemas/all-ee-1.0.xsd b/lib/schemas/all-ee-1.0.xsd
index 5ad285c98..3013daf48 100644
--- a/lib/schemas/all-ee-1.0.xsd
+++ b/lib/schemas/all-ee-1.0.xsd
@@ -17,25 +17,24 @@
     in incompatibility with EPP standard.
     -->
     <import namespace="urn:ietf:params:xml:ns:eppcom-1.0"
-      schemaLocation="eppcom-1.0.xsd"/>
+      schemaLocation="lib/schemas/eppcom-1.0.xsd"/>
     <import namespace="urn:ietf:params:xml:ns:epp-1.0"
-      schemaLocation="epp-1.0.xsd"/>
+      schemaLocation="lib/schemas/epp-1.0.xsd"/>
     <!-- EPP protocol extension: DNSSEC -->
     <import namespace="urn:ietf:params:xml:ns:secDNS-1.1"
-      schemaLocation="secDNS-1.1.xsd"/>
+      schemaLocation="lib/schemas/secDNS-1.1.xsd"/>
     <!-- EPP protocol extension: DNSSEC keyrelay -->
     <import namespace="urn:ietf:params:xml:ns:keyrelay-1.0"
-      schemaLocation="keyrelay-1.0.xsd"/>
+      schemaLocation="lib/schemas/keyrelay-1.0.xsd"/>
     <import namespace="urn:ietf:params:xml:ns:host-1.0"
-      schemaLocation="host-1.0.xsd"/>
+      schemaLocation="lib/schemas/host-1.0.xsd"/>
     <!-- EPP protocol extension: .ee specific -->
     <import namespace="https://epp.tld.ee/schema/eis-1.0"
-      schemaLocation="eis-1.0.xsd"/>
+      schemaLocation="lib/schemas/eis-1.0.xsd"/>
     <import namespace="https://epp.tld.ee/schema/contact-eis-1.0"
-      schemaLocation="contact-eis-1.0.xsd"/>
+      schemaLocation="lib/schemas/contact-eis-1.0.xsd"/>
     <import namespace="https://epp.tld.ee/schema/domain-eis-1.0"
-      schemaLocation="domain-eis-1.0.xsd"/>
-
+      schemaLocation="lib/schemas/domain-eis-1.0.xsd"/>
 
     <annotation>
       <documentation>
diff --git a/lib/schemas/eppcom-1.0.xsd b/lib/schemas/eppcom-1.0.xsd
index d6ef94b24..3b7d5d65c 100644
--- a/lib/schemas/eppcom-1.0.xsd
+++ b/lib/schemas/eppcom-1.0.xsd
@@ -53,7 +53,7 @@ Abstract client and object identifier type.
   <simpleType name="clIDType">
     <restriction base="token">
       <minLength value="3"/>
-      <maxLength value="16"/>
+<!--      <maxLength value="16"/> -->
     </restriction>
   </simpleType>
 
@@ -102,4 +102,4 @@ Transfer status identifiers.
 <!--
 End of schema.
 -->
-</schema>
\ No newline at end of file
+</schema>