diff --git a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
index aa0f033757..dd06c95826 100644
--- a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
+++ b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
@@ -672,7 +672,7 @@ namespace OpenSim.Groups
 
             serviceLocation = group.ServiceLocation;
             name = group.GroupName;
-            bool isLocal = (group.ServiceLocation == string.Empty);
+            bool isLocal = (group.ServiceLocation.Length == 0);
             //m_log.DebugFormat("[XXX]: IsLocal? {0}", isLocal);
             return isLocal;
         }
diff --git a/OpenSim/Addons/OfflineIM/OfflineIMRegionModule.cs b/OpenSim/Addons/OfflineIM/OfflineIMRegionModule.cs
index 1d1bb16ce5..5e9b57ad98 100644
--- a/OpenSim/Addons/OfflineIM/OfflineIMRegionModule.cs
+++ b/OpenSim/Addons/OfflineIM/OfflineIMRegionModule.cs
@@ -185,9 +185,12 @@ namespace OpenSim.OfflineIM
                     // Needed for proper state management for stored group
                     // invitations
                     //
-                    Scene s = FindScene(client.AgentId);
+                    Scene s = client.Scene as Scene;
                     if (s != null)
+                    {
+                        im.offline = 1;
                         s.EventManager.TriggerIncomingInstantMessage(im);
+                    }
                 }
             }
         }