diff --git a/OpenSim/Data/NHibernate/Resources/InventoryFolderBase.hbm.xml b/OpenSim/Data/NHibernate/Resources/InventoryFolderBase.hbm.xml
index c163020ca5..d24d3128c2 100644
--- a/OpenSim/Data/NHibernate/Resources/InventoryFolderBase.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/InventoryFolderBase.hbm.xml
@@ -6,7 +6,6 @@
         </id> 
         <property name="Type" type="short" />
         <property name="Version" type="short" />
-        <property name="AssetID" type="OpenSim.Data.NHibernate.LLUUIDString, OpenSim.Data.NHibernate" />
         <property name="ParentID" index="parent_id" type="OpenSim.Data.NHibernate.LLUUIDString, OpenSim.Data.NHibernate" />
         <property name="Owner" index="owner_id" type="OpenSim.Data.NHibernate.LLUUIDString, OpenSim.Data.NHibernate" />
         <property name="Name" type="String" length="64" />
diff --git a/OpenSim/Data/NHibernate/Resources/InventoryItemBase.hbm.xml b/OpenSim/Data/NHibernate/Resources/InventoryItemBase.hbm.xml
index dfbdf3ee63..8a0fb699b3 100644
--- a/OpenSim/Data/NHibernate/Resources/InventoryItemBase.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/InventoryItemBase.hbm.xml
@@ -7,14 +7,14 @@
         <property name="InvType" type="int" />
         <property name="AssetType" type="int" />
         <property name="AssetID" type="OpenSim.Data.NHibernate.LLUUIDString, OpenSim.Data.NHibernate" />
-        <property name="Folder" type="OpenSim.Data.NHibernate.LLUUIDString, OpenSim.Data.NHibernate" />
-        <property name="Owner" type="OpenSim.Data.NHibernate.LLUUIDString, OpenSim.Data.NHibernate" />
+        <property name="Folder" index="folder_id" type="OpenSim.Data.NHibernate.LLUUIDString, OpenSim.Data.NHibernate" />
+        <property name="Owner" index="owner_id" type="OpenSim.Data.NHibernate.LLUUIDString, OpenSim.Data.NHibernate" />
         <property name="Creator" type="OpenSim.Data.NHibernate.LLUUIDString, OpenSim.Data.NHibernate" />
         <property name="Name" type="String" length="64" />
         <property name="Description" type="String" length="64" />
-        <property name="NextPermissions" type="uint" />
-        <property name="CurrentPermissions" type="uint" />
-        <property name="BasePermissions" type="uint" />
-        <property name="EveryOnePermissions" type="uint" />
+        <property name="NextPermissions" type="UInt32" />
+        <property name="CurrentPermissions" type="UInt32" />
+        <property name="BasePermissions" type="UInt32" />
+        <property name="EveryOnePermissions" type="UInt32" />
     </class>
 </hibernate-mapping>
\ No newline at end of file