diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 77bf8a3230..f89430a0b7 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -5541,7 +5541,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return (item == null) ? LSL_String.Empty : item.Description;
         }
 
-        public LSL_Key osGetLinkInventoryAssetKey(LSL_Integer linkNumber, LSL_String name, LSL_Integer type)
+        public LSL_Key osGetLinkInventoryItemAssetKey(LSL_Integer linkNumber, LSL_String name, LSL_Integer type)
         {
             SceneObjectPart part = GetSingleLinkPart(linkNumber);
             if(part == null)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 622bededf1..e0cfe81945 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -561,7 +561,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
        LSL_Integer osApproxEquals(rotation ra, rotation rb, LSL_Float margin);
         LSL_Key osGetInventoryLastOwner(LSL_String itemNameOrId);
         LSL_Key osGetInventoryItemKey(LSL_String name);
-        LSL_Key osGetLinkInventoryAssetKey(LSL_Integer linkNumber, LSL_String name, LSL_Integer type);
+        LSL_Key osGetLinkInventoryItemAssetKey(LSL_Integer linkNumber, LSL_String name, LSL_Integer type);
         LSL_Key osGetLinkInventoryItemKey(LSL_Integer linkNumber, LSL_String name);
      LSL_String osGetInventoryName(LSL_Key itemId);
      LSL_String osGetLinkInventoryName(LSL_Integer linkNumber, LSL_Key itemId);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index d25722c43c..bd6148c241 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -1461,9 +1461,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public LSL_Key osGetLinkInventoryAssetKey(LSL_Integer linkNumber, LSL_String name, LSL_Integer type)
+        public LSL_Key osGetLinkInventoryItemAssetKey(LSL_Integer linkNumber, LSL_String name, LSL_Integer type)
         {
-            return m_OSSL_Functions.osGetLinkInventoryAssetKey(linkNumber, name, type);
+            return m_OSSL_Functions.osGetLinkInventoryItemAssetKey(linkNumber, name, type);
         }
     
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
diff --git a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
index c6fcf89445..38d9881168 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
@@ -202,11 +202,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
 
                 Owner = Key;
                 Position = new LSL_Types.Vector3(presence.AbsolutePosition);
-                Rotation = new LSL_Types.Quaternion(
-                        presence.Rotation.X,
-                        presence.Rotation.Y,
-                        presence.Rotation.Z,
-                        presence.Rotation.W);
+                Rotation = new LSL_Types.Quaternion(presence.Rotation);
                 Velocity = new LSL_Types.Vector3(presence.Velocity);
 
                 Type = 0x01; // Avatar