diff --git a/classes/ObjectModel.php b/classes/ObjectModel.php
index 85ec3df3e..82619f7f8 100644
--- a/classes/ObjectModel.php
+++ b/classes/ObjectModel.php
@@ -233,7 +233,10 @@ abstract class ObjectModelCore
 	public function getFields()
 	{
 		$this->validateFields();
-		return $this->formatFields();
+		$fields = $this->formatFields();
+		if (!$fields)
+			$fields[$this->def['primary']] = $this->id;
+		return $fields;
 	}
 
 	/**
diff --git a/install-new/classes/xmlLoader.php b/install-new/classes/xmlLoader.php
index d829774ea..1173e9cee 100644
--- a/install-new/classes/xmlLoader.php
+++ b/install-new/classes/xmlLoader.php
@@ -197,8 +197,6 @@ class InstallXmlLoader
 		}
 		while ($current != $sort_entities);
 
-		$start = microtime(true);
-
 		// Populate entities
 		foreach ($sort_entities as $entity)
 		{