diff --git a/OpenSim/Data/NHibernate/NHibernateRegionData.cs b/OpenSim/Data/NHibernate/NHibernateRegionData.cs
index 86a93f2224..52db32d68f 100644
--- a/OpenSim/Data/NHibernate/NHibernateRegionData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateRegionData.cs
@@ -259,7 +259,9 @@ namespace OpenSim.Data.NHibernate
                 {
                     inventory.Add(i);
                 }
-                p.RestoreInventoryItems(inventory);
+
+                if (inventory.Count > 0)
+                    p.RestoreInventoryItems(inventory);
             }
             foreach (SceneObjectGroup g in SOG.Values) 
             {
diff --git a/OpenSim/Data/NHibernate/Resources/MySQLDialect/003_RegionStore.sql b/OpenSim/Data/NHibernate/Resources/MySQLDialect/003_RegionStore.sql
index 2cf46b5e84..230e93c8d3 100644
--- a/OpenSim/Data/NHibernate/Resources/MySQLDialect/003_RegionStore.sql
+++ b/OpenSim/Data/NHibernate/Resources/MySQLDialect/003_RegionStore.sql
@@ -2,7 +2,6 @@ BEGIN;
 
 CREATE TABLE `PrimItems` (
   `InvType` int(11) default NULL,
-  `AssetType` int(11) default NULL,
   `Name` varchar(255) default NULL,
   `Description` varchar(255) default NULL,
   `CreationDate` bigint(20) default NULL,
diff --git a/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml b/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml
index ffaea514da..ef3ab9b4b5 100644
--- a/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml
@@ -116,7 +116,7 @@
       </id>
       <property name="ParentPartID" column="PrimID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/> 
       <property name="AssetID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/> 
-      <property name="ParentFolderID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/> 
+      <property name="ParentID" column="ParentFolderID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/> 
       <property name="CreatorID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/> 
       <property name="OwnerID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/> 
       <property name="GroupID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/> 
@@ -131,6 +131,5 @@
       <property name="CreationDate" type="System.UInt32" />
       <property name="Flags" type="System.UInt32" />
       <property name="InvType" type="System.Int32" />
-      <property name="AssetType" type="System.Int32" />
     </class>
 </hibernate-mapping>
\ No newline at end of file