diff --git a/OpenSim/Framework/Serialization/ArchiveConstants.cs b/OpenSim/Framework/Serialization/ArchiveConstants.cs
index 8715d0196d..63d8bd14fb 100644
--- a/OpenSim/Framework/Serialization/ArchiveConstants.cs
+++ b/OpenSim/Framework/Serialization/ArchiveConstants.cs
@@ -96,7 +96,7 @@ namespace OpenSim.Framework.Serialization
         /// <summary>
         /// Template used for creating filenames in OpenSim Archives.
         /// </summary>
-        public const string OAR_OBJECT_FILENAME_TEMPLATE = "{0}_{1:000}-{2:000}-{3:000}__{4}.xml";
+        public const string OAR_OBJECT_FILENAME_TEMPLATE = "{0}_{1:#000}-{2:#000}-{3:#000}__{4}.xml";
 
         /// <value>
         /// Extensions used for asset types in the archive
@@ -155,7 +155,7 @@ namespace OpenSim.Framework.Serialization
 
         public static string CreateOarLandDataPath(LandData ld)
         {
-            return string.Format("{0}{1}.xml", ArchiveConstants.LANDDATA_PATH, ld.GlobalID);
+            return $"{ArchiveConstants.LANDDATA_PATH}{ld.GlobalID}.xml";
         }
 
         /// <summary>
@@ -169,7 +169,7 @@ namespace OpenSim.Framework.Serialization
         {
             return string.Format(
                 OAR_OBJECT_FILENAME_TEMPLATE, objectName,
-                Math.Round(pos.X), Math.Round(pos.Y), Math.Round(pos.Z),
+                MathF.Round(pos.X), MathF.Round(pos.Y), MathF.Round(pos.Z),
                 uuid);
         }
 
@@ -192,7 +192,7 @@ namespace OpenSim.Framework.Serialization
         /// <returns></returns>
         public static string ExtractPlainPathFromIarPath(string iarPath)
         {
-            List<string> plainDirs = new List<string>();
+            List<string> plainDirs = new();
 
             string[] iarDirs = iarPath.Split(new char[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
 
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index d8402cb715..d52f24922b 100755
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -5373,10 +5373,9 @@ Label_GroupsDone:
         /// <param name="fullID"></param>
         /// <param name="sop"></param>
         /// <returns></returns>
-        public bool TryGetSceneObjectPart(UUID fullID, out SceneObjectPart sop)
+        public bool TryGetSceneObjectPart(in UUID fullID, out SceneObjectPart sop)
         {
-            sop = GetSceneObjectPart(fullID);
-            return sop != null;
+            return m_sceneGraph.TryGetSceneObjectPart(fullID, out sop);
         }
 
         /// <summary>
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 158bf8ada1..3df2569b62 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -15301,7 +15301,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 {
                     name = presence.Name;
                 }
-                else if (World.TryGetSceneObjectPart(key, out SceneObjectPart sop ) && sop != null)
+                else if (World.TryGetSceneObjectPart(key, out SceneObjectPart sop ))
                 {
                     name = sop.Name;
                 }