diff --git a/application/exceptions/CoreException.php b/application/exceptions/CoreException.php
index f8afd2e5c..178b5397d 100644
--- a/application/exceptions/CoreException.php
+++ b/application/exceptions/CoreException.php
@@ -67,7 +67,7 @@ class CoreException extends Exception
 
 	public function getHtmlDesc($sHighlightHtmlBegin = '<b>', $sHighlightHtmlEnd = '</b>')
 	{
-		return $this->getMessage();
+		return utils::EscapeHtml($this->getMessage());
 	}
 
 	/**
diff --git a/datamodels/2.x/authent-ldap/datamodel.authent-ldap.xml b/datamodels/2.x/authent-ldap/datamodel.authent-ldap.xml
index dfaa4ea32..faac427ac 100644
--- a/datamodels/2.x/authent-ldap/datamodel.authent-ldap.xml
+++ b/datamodels/2.x/authent-ldap/datamodel.authent-ldap.xml
@@ -21,12 +21,10 @@
         <db_key_field>id</db_key_field>
         <db_final_class_field/>
         <naming>
-          <format>%1$s</format>
           <attributes>
             <attribute id="login"/>
           </attributes>
         </naming>
-        <display_template/>
         <style>
           <icon/>
         </style>
diff --git a/datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml b/datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml
index 53c163056..888bcd23b 100755
--- a/datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml
+++ b/datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml
@@ -46,12 +46,12 @@
         <field id="status" xsi:type="AttributeEnum">
           <sort_type>rank</sort_type>
           <values>
-            <value id="approved">approved
+            <value id="approved">
               <code>approved</code>
               <rank>60</rank>
               <style><main_color>$ibo-lifecycle-success-state-primary-color</main_color><complementary_color>$ibo-lifecycle-success-state-secondary-color</complementary_color><decoration_classes>fas fa-user-check</decoration_classes></style>
             </value>
-            <value id="assigned">assigned
+            <value id="assigned">
               <code>assigned</code>
               <rank>40</rank>
               <style><main_color>$ibo-lifecycle-neutral-state-primary-color</main_color><complementary_color>$ibo-lifecycle-neutral-state-secondary-color</complementary_color><decoration_classes/></style>
diff --git a/datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml b/datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml
index 37720dbae..cc5f88ac3 100755
--- a/datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml
+++ b/datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml
@@ -380,7 +380,6 @@
               </attribute>
               <attribute id="private_log">
                 <read_only/>
-                <read_only/>
               </attribute>
               <attribute id="caller_id">
                 <read_only/>
diff --git a/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml b/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
index 161eedcab..d9da9cb7d 100755
--- a/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
+++ b/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
@@ -4351,7 +4351,6 @@
             </item>
             <item id="document_id">
               <rank>20</rank>
-              <rank>20</rank>
             </item>
           </items>
         </list>
@@ -5736,8 +5735,7 @@
           <duplicates/>
         </field>
       </fields>
-      <methods>
-			</methods>
+      <methods/>
       <presentation>
         <details>
           <items>
@@ -7230,7 +7228,12 @@
     </class>
     <class id="DocumentFile" _delta="must_exist">
       <presentation>
-        <details><items><item id="cis_list" _delta="define"><rank>70</rank></item></items>&gt;
+        <details>
+          <items>
+            <item id="cis_list" _delta="define">
+              <rank>70</rank>
+            </item>
+          </items>
         </details>
       </presentation>
     </class>
diff --git a/datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml b/datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml
index b5b7a4972..b46d0f1b6 100755
--- a/datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml
+++ b/datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml
@@ -797,7 +797,6 @@
           <is_null_allowed>true</is_null_allowed>
           <on_target_delete>DEL_MANUAL</on_target_delete>
           <allow_target_creation>false</allow_target_creation>
-          <allow_target_creation>false</allow_target_creation>
         </field>
         <field id="powerstart_name" xsi:type="AttributeExternalField">
           <extkey_attcode>powerstart_id</extkey_attcode>
diff --git a/setup/modulediscovery.class.inc.php b/setup/modulediscovery.class.inc.php
index 81482c678..96822a982 100644
--- a/setup/modulediscovery.class.inc.php
+++ b/setup/modulediscovery.class.inc.php
@@ -40,15 +40,17 @@ class MissingDependencyException extends CoreException
 <ul>
 HTML;
 		foreach ($this->aModulesInfo as $sModuleId => $aModuleErrors) {
-			$sModuleLabel = $aModuleErrors['module']['label'];
+			$sModuleLabel = utils::EscapeHtml($aModuleErrors['module']['label']);
+			$sModuleId = utils::EscapeHtml($sModuleId);
 			$aModuleMissingDependencies = $aModuleErrors['dependencies'];
 			$sErrorMessage .= <<<HTML
-	<li><strong>{$sModuleLabel}</strong> ({$sModuleId}):
+	<li><strong>$sModuleLabel</strong> ($sModuleId):
 		<ul>
 HTML;
 
 			foreach ($aModuleMissingDependencies as $sMissingModule) {
-				$sErrorMessage .= "<li>{$sMissingModule}</li>";
+				$sMissingModule = utils::EscapeHtml($sMissingModule);
+				$sErrorMessage .= "<li>$sMissingModule</li>";
 			}
 			$sErrorMessage .= <<<HTML
 		</ul>