diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
index b188b747ca..23d79e50fc 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
@@ -101,9 +101,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 
         public virtual void PostInitialise()
         {
-            if (!m_Enabled)
-                return;
-
         }
 
         public virtual void RegionLoaded(Scene scene)
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 81395b0b91..9a07d7f84b 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -555,6 +555,8 @@ namespace OpenSim.Region.CoreModules.World.Estate
                 case 3:
                     Scene.RegionInfo.RegionSettings.TerrainTexture4 = texture;
                     break;
+                default:
+                    return;
             }
 
             Scene.RegionInfo.RegionSettings.Save();
@@ -582,6 +584,8 @@ namespace OpenSim.Region.CoreModules.World.Estate
                     Scene.RegionInfo.RegionSettings.Elevation1NE = lowValue;
                     Scene.RegionInfo.RegionSettings.Elevation2NE = highValue;
                     break;
+                default:
+                    return;
             }
 
             Scene.RegionInfo.RegionSettings.Save();
diff --git a/OpenSim/Services/HypergridService/HGInstantMessageService.cs b/OpenSim/Services/HypergridService/HGInstantMessageService.cs
index b043174e69..b45b42d13a 100644
--- a/OpenSim/Services/HypergridService/HGInstantMessageService.cs
+++ b/OpenSim/Services/HypergridService/HGInstantMessageService.cs
@@ -89,7 +89,7 @@ namespace OpenSim.Services.HypergridService
                 if (string.IsNullOrEmpty(userAgentService))
                     m_log.WarnFormat("[HG IM SERVICE]: UserAgentService not set in [HGInstantMessageService]");
 
-                object[] args = new object[] { config };
+                object[] args = [ config ];
                 try
                 {
                     m_GridService = ServerUtils.LoadPlugin<IGridService>(gridService, args);
diff --git a/OpenSim/Services/Interfaces/IPresenceService.cs b/OpenSim/Services/Interfaces/IPresenceService.cs
index 90f98426f2..aa4d655725 100644
--- a/OpenSim/Services/Interfaces/IPresenceService.cs
+++ b/OpenSim/Services/Interfaces/IPresenceService.cs
@@ -43,19 +43,19 @@ namespace OpenSim.Services.Interfaces
 
         public PresenceInfo(Dictionary<string, object> kvp)
         {
-            if (kvp.ContainsKey("UserID"))
-                UserID = kvp["UserID"].ToString();
-            if (kvp.ContainsKey("RegionID"))
-                UUID.TryParse(kvp["RegionID"].ToString(), out RegionID);
+            if (kvp.TryGetValue("UserID", out object ouid))
+                UserID = ouid.ToString();
+            if (kvp.TryGetValue("RegionID", out object orid))
+                _ = UUID.TryParse(orid.ToString(), out RegionID);
         }
 
         public Dictionary<string, object> ToKeyValuePairs()
         {
-            Dictionary<string, object> result = new Dictionary<string, object>();
-            result["UserID"] = UserID;
-            result["RegionID"] = RegionID.ToString();
-
-            return result;
+            return new Dictionary<string, object>
+            {
+                ["UserID"] = UserID,
+                ["RegionID"] = RegionID.ToString()
+            };
         }
     }