diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index 795e0e64eb..92b10f709c 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -97,10 +97,8 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
                         {
                             ScenePresence p = req.presence;
 
-                            bool ok = true;
                             bool foreign = GetUserProfileServerURI(req.agent, out string serverURI);
-                            if(serverURI.Length == 0)
-                                ok = false;
+                            bool ok  = serverURI.Length > 0;
 
                             Byte[] membershipType = new Byte[1];
                             string born = string.Empty;
diff --git a/OpenSim/Region/Framework/Scenes/GodController.cs b/OpenSim/Region/Framework/Scenes/GodController.cs
index 159f9c504a..e990831393 100644
--- a/OpenSim/Region/Framework/Scenes/GodController.cs
+++ b/OpenSim/Region/Framework/Scenes/GodController.cs
@@ -242,7 +242,7 @@ namespace OpenSim.Region.Framework.Scenes
                 OSDMap s = (OSDMap)state;
                 if (s.TryGetValue("ViewerUiIsGod", out OSD tmp))
                     newstate = tmp.AsBoolean();
-                m_lastLevelToViewer = m_viewergodlevel; // we are not changing viewer level by default
+                m_lastLevelToViewer = newstate ? 200 : m_viewergodlevel;
             }       
             UpdateGodLevels(newstate);
         }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
index 525122d5c6..82352d4559 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
@@ -26,7 +26,6 @@
  */
 
 using System;
-using System.IO;
 using System.Reflection;
 using OpenMetaverse;
 using log4net;