diff --git a/pandora_agents/pc/plugins/files_indir b/pandora_agents/pc/plugins/files_indir
index dc29bcd051..fc9aae346c 100644
--- a/pandora_agents/pc/plugins/files_indir
+++ b/pandora_agents/pc/plugins/files_indir
@@ -40,15 +40,15 @@ echo $CURRENT > $DIRETMP
 
 echo "<module>
     <name><![CDATA[FS_$DIRE]]></name>
-    <description>Number of files in directory</description>
-    <type>generic_proc</type>
-    <data>$DISPARA</data>
+    <description><![CDATA[Number of files in directory]]></description>
+    <type><![CDATA[generic_proc]]></type>
+    <data><![CDATA[$DISPARA]]></data>
 </module>
 
 <module>
     <name><![CDATA[NumFiles_FS_$DIRE]]></name>
-    <description>Number of files</description>
-    <type>generic_data</type>
-    <data>$CURRENT</data>
+    <description><![CDATA[Number of files]]></description>
+    <type><![CDATA[generic_data]]></type>
+    <data><![CDATA[$CURRENT]]></data>
 </module>"
 
diff --git a/pandora_agents/pc/plugins/nagios_plugin_wrapper b/pandora_agents/pc/plugins/nagios_plugin_wrapper
index 63b9058380..34b5e80eb1 100644
--- a/pandora_agents/pc/plugins/nagios_plugin_wrapper
+++ b/pandora_agents/pc/plugins/nagios_plugin_wrapper
@@ -59,11 +59,11 @@ if ($command ne ""){
     elsif ($ReturnCode == 4){
 	    $module_data = 3; # need to be managed on module thresholds
     }
-
+	
     print "<module>";
-    print "<name>".$module_name."</name>\n";
-    print "<type>generic_proc</type>\n";
-    print "<data>".$module_data."</data>\n";
+    print "<name><![CDATA[".$module_name."]]></name>\n";
+    print "<type><![CDATA[generic_proc]]></type>\n";
+    print "<data><![CDATA[".$module_data."]]></data>\n";
     print "<description><![CDATA[" . $module_description . "]]></description>\n";
     print "</module>\n";
 
diff --git a/pandora_agents/pc/plugins/pandora_df b/pandora_agents/pc/plugins/pandora_df
index 59e04719cc..48118b771d 100644
--- a/pandora_agents/pc/plugins/pandora_df
+++ b/pandora_agents/pc/plugins/pandora_df
@@ -78,7 +78,7 @@ while (my ($filesystem, $use) = each (%filesystems)) {
 	print "<name><![CDATA[" . $filesystem . "]]></name>\n";
 	print "<type><![CDATA[generic_data]]></type>\n";
 	print "<data><![CDATA[" . $use . "]]></data>\n";
-	print "<description>% of usage in this volume</description>\n";
+	print "<description><![CDATA[% of usage in this volume]]></description>\n";
 	print "</module>\n";
 }