diff --git a/OpenSim/Region/Environment/PermissionManager.cs b/OpenSim/Region/Environment/PermissionManager.cs
index 171ced1976..30f91ada11 100644
--- a/OpenSim/Region/Environment/PermissionManager.cs
+++ b/OpenSim/Region/Environment/PermissionManager.cs
@@ -83,7 +83,7 @@ namespace OpenSim.Region.Environment
             }
 
             // If there is no master avatar, return false
-            if (m_scene.RegionInfo.MasterAvatarAssignedUUID != null)
+            if (!m_scene.RegionInfo.MasterAvatarAssignedUUID.Equals(null))
             {
                 return m_scene.RegionInfo.MasterAvatarAssignedUUID == user;
             }
@@ -97,7 +97,7 @@ namespace OpenSim.Region.Environment
             {
                 return true;
             }
-            if (user != null)
+            if (!user.Equals(null))
             {
                 LLUUID[] estatemanagers = m_scene.RegionInfo.EstateSettings.estateManagers;
                 for (int i = 0; i < estatemanagers.Length; i++)
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 78b28d5d84..229ab1cd32 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -342,7 +342,7 @@ namespace OpenSim.Region.Environment.Scenes
             asset.Description = description;
             asset.InvType = invType;
             asset.Type = assetType;
-            asset.FullID = LLUUID.Random(); // TODO: check for conflicts
+            asset.FullID = LLUUID.Random();
             asset.Data = (data == null) ? new byte[1] : data;
             return asset;
         }
@@ -781,7 +781,7 @@ namespace OpenSim.Region.Environment.Scenes
                                 InventoryItemBase item = new InventoryItemBase();
                                 item.avatarID = remoteClient.AgentId;
                                 item.creatorsID = remoteClient.AgentId;
-                                item.inventoryID = LLUUID.Random(); // TODO: check for conflicts
+                                item.inventoryID = LLUUID.Random();
                                 item.assetID = asset.FullID;
                                 item.inventoryDescription = asset.Description;
                                 item.inventoryName = asset.Name;
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs
index 84e8313126..f6424e9303 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs
@@ -258,7 +258,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin
                             if (ang_obj > ts.arc) keep = false;
                         }
 
-                        if (keep && (ts.keyID != null) && (ts.keyID != LLUUID.Zero) && (ts.keyID != ent.UUID))
+                        if (keep && (!ts.keyID.Equals(null)) && (ts.keyID != LLUUID.Zero) && (ts.keyID != ent.UUID))
                         {
                             keep = false;
                         }