diff --git a/OpenSim/Data/NHibernate/NHibernateAssetData.cs b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
index 4f05855e85..cc018ddbed 100644
--- a/OpenSim/Data/NHibernate/NHibernateAssetData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
@@ -67,11 +67,11 @@ namespace OpenSim.Data.NHibernate
             cfg.AddAssembly("OpenSim.Data.NHibernate");
 
             HbmSerializer.Default.Validate = true;
-//             using ( System.IO.MemoryStream stream = 
-//                     HbmSerializer.Default.Serialize(System.Reflection.Assembly.GetExecutingAssembly()))
-//                 cfg.AddInputStream(stream);
+            using ( System.IO.MemoryStream stream = 
+                    HbmSerializer.Default.Serialize(System.Reflection.Assembly.GetExecutingAssembly()))
+                cfg.AddInputStream(stream);
             
-//             new SchemaExport(cfg).Create(true, true);
+            // new SchemaExport(cfg).Create(true, true);
 
             factory  = cfg.BuildSessionFactory();
         }
@@ -80,7 +80,7 @@ namespace OpenSim.Data.NHibernate
         {
             using(ISession session = factory.OpenSession()) {
                 try {
-                    return session.Load(typeof(AssetBase), uuid.ToString()) as AssetBase;
+                    return session.Load(typeof(AssetBase), uuid) as AssetBase;
                 } catch {
                     return null;
                 }
diff --git a/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml b/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml
index 71f498cfb1..086fbc1def 100644
--- a/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
     <class name="OpenSim.Framework.AssetBase, OpenSim.Framework" table="Assets" lazy="false">
-        <id name="FullID" column="UUID" type="OpenSim.Data.NHibernate.LLUUIDString"> 
+        <id name="FullID" column="UUID" type="OpenSim.Data.NHibernate.LLUUIDString, OpenSim.Data.NHibernate"> 
             <generator class="assigned" /> 
         </id> 
         <property name="Type" type="SByte" />
diff --git a/OpenSim/Data/NHibernate/Resources/InventoryItemBase.xml b/OpenSim/Data/NHibernate/Resources/InventoryItemBase.xml
index ba1dda47ae..dfbdf3ee63 100644
--- a/OpenSim/Data/NHibernate/Resources/InventoryItemBase.xml
+++ b/OpenSim/Data/NHibernate/Resources/InventoryItemBase.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
     <class name="OpenSim.Framework.InventoryItemBase, OpenSim.Framework" table="InventoryItems" lazy="false">
-        <id name="ID" type="OpenSim.Data.NHibernate.LLUUIDString"> 
+        <id name="ID" type="OpenSim.Data.NHibernate.LLUUIDString, OpenSim.Data.NHibernate"> 
             <generator class="assigned" /> 
         </id> 
         <property name="InvType" type="int" />
         <property name="AssetType" type="int" />
-        <property name="AssetID" type="OpenSim.Data.NHibernate.LLUUIDString" />
-        <property name="Folder" type="OpenSim.Data.NHibernate.LLUUIDString" />
-        <property name="Owner" type="OpenSim.Data.NHibernate.LLUUIDString" />
-        <property name="Creator" type="OpenSim.Data.NHibernate.LLUUIDString" />
+        <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="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" />
diff --git a/OpenSim/Data/NHibernate/Types/LLUUIDType.cs b/OpenSim/Data/NHibernate/Types/LLUUIDType.cs
index 21d3774a5c..b8e5739d8e 100644
--- a/OpenSim/Data/NHibernate/Types/LLUUIDType.cs
+++ b/OpenSim/Data/NHibernate/Types/LLUUIDType.cs
@@ -57,6 +57,7 @@ namespace OpenSim.Data.NHibernate
         {
             LLUUID UUID = (LLUUID)obj;
             ((IDataParameter)cmd.Parameters[index]).Value = UUID.ToString();
+            System.Console.WriteLine("Setting UUID {0}", UUID.ToString());
         }
 
         public object Replace(object original, object target, object owner)
@@ -71,8 +72,7 @@ namespace OpenSim.Data.NHibernate
 
         public SqlType[] SqlTypes
         {
-            // I think we're up to 36
-            get { return new SqlType [] { SqlTypeFactory.GetString(36) }; }
+            get { return new SqlType [] { SqlTypeFactory.GetString(32) }; }
         }
     }
 }