diff --git a/OpenSim/Data/NHibernate/Resources/UserAgentData.hbm.xml b/OpenSim/Data/NHibernate/Resources/UserAgentData.hbm.xml
index 4ff884dead..a642ae8b50 100644
--- a/OpenSim/Data/NHibernate/Resources/UserAgentData.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/UserAgentData.hbm.xml
@@ -6,16 +6,16 @@
         </id>
         <property name="AgentIP" type="String" length="24" />
         <property name="AgentPort" type="UInt32" />
-        <property name="AgentOnline" type="bool" />
+        <property name="AgentOnline" type="boolean" />
         <property name="SessionID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />
         <property name="SecureSessionID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />
         <property name="InitialRegion" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />
         <property name="Region" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />
         <property name="LoginTime" type="Int32" />
         <property name="LogoutTime" type="Int32" />
-        <property name="Handle" type="ulong" />
-        <property name="PositionX" type="float" />
-        <property name="PositionY" type="float" />
-        <property name="PositionZ" type="float" />
+        <property name="Handle" type="UInt64" />
+        <property name="PositionX" type="Single" />
+        <property name="PositionY" type="Single" />
+        <property name="PositionZ" type="Single" />
     </class>
 </hibernate-mapping>
\ No newline at end of file
diff --git a/OpenSim/Data/NHibernate/Resources/UserProfileData.hbm.xml b/OpenSim/Data/NHibernate/Resources/UserProfileData.hbm.xml
index 0dede95cf7..572916a8e8 100644
--- a/OpenSim/Data/NHibernate/Resources/UserProfileData.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/UserProfileData.hbm.xml
@@ -10,12 +10,13 @@
         <property name="PasswordSalt" type="String" length="32" />
         <property name="WebLoginKey" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />
         <property name="HomeRegionX" type="UInt32" />
-        <property name="HomeLocationX" type="Float" />
-        <property name="HomeLocationY" type="Float" />
-        <property name="HomeLocationZ" type="Float" />
-        <property name="HomeLookAtX" type="Float" />
-        <property name="HomeLookAtY" type="Float" />
-        <property name="HomeLookAtZ" type="Float" />
+        <property name="HomeRegionY" type="UInt32" />
+        <property name="HomeLocationX" type="Single" />
+        <property name="HomeLocationY" type="Single" />
+        <property name="HomeLocationZ" type="Single" />
+        <property name="HomeLookAtX" type="Single" />
+        <property name="HomeLookAtY" type="Single" />
+        <property name="HomeLookAtZ" type="Single" />
         <property name="Created" type="int" />
         <property name="LastLogin" type="int" />
         <property name="RootInventoryFolderID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />