diff --git a/setup/compiler.class.inc.php b/setup/compiler.class.inc.php
index e5e5b7f9b..17300dbb8 100644
--- a/setup/compiler.class.inc.php
+++ b/setup/compiler.class.inc.php
@@ -289,8 +289,7 @@ class MFCompiler
 					$aAllClasses[] = $sClass;
 					try
 					{
-						$sCompiledCode .= $this->CompileClass($oClass, $sTempTargetDir, $sFinalTargetDir,
-							$sRelativeDir);
+						$sCompiledCode .= $this->CompileClass($oClass, $sTempTargetDir, $sFinalTargetDir, $sRelativeDir);
 					}
 					catch (DOMFormatException $e)
 					{
diff --git a/setup/modelfactory.class.inc.php b/setup/modelfactory.class.inc.php
index 0965599ba..8446ba943 100644
--- a/setup/modelfactory.class.inc.php
+++ b/setup/modelfactory.class.inc.php
@@ -1188,7 +1188,7 @@ EOF
 	 */
 	public function ListClasses($sModuleName)
 	{
-		return $this->GetNodes("/itop_design/classes//class[@_created_in='$sModuleName']");
+		return $this->GetNodes("/itop_design/classes//class[@id][@_created_in='$sModuleName']");
 	}
 		
 	/**
@@ -1197,7 +1197,7 @@ EOF
 	 */
 	public function ListAllClasses()
 	{
-		return $this->GetNodes("/itop_design/classes//class");
+		return $this->GetNodes("/itop_design/classes//class[@id]");
 	}
 	
 	/**
@@ -1206,7 +1206,7 @@ EOF
 	 */
 	public function ListRootClasses()
 	{
-		return $this->GetNodes("/itop_design/classes/class/class[class]");
+		return $this->GetNodes("/itop_design/classes/class/class[@id][class]");
 	}
 
 	/**