diff --git a/OpenSim/Region/Framework/Scenes/Prioritizer.cs b/OpenSim/Region/Framework/Scenes/Prioritizer.cs
index 4c423d4279..9f2399beb6 100644
--- a/OpenSim/Region/Framework/Scenes/Prioritizer.cs
+++ b/OpenSim/Region/Framework/Scenes/Prioritizer.cs
@@ -247,6 +247,9 @@ namespace OpenSim.Region.Framework.Scenes
             Vector3 grppos = group.getCenterOffset();
             distance = Vector3.Distance(presencePos, grppos);
             distance -= bradius;
+            if(distance < 0)
+                return pqueue;
+
             distance *= group.getAreaFactor();
             if(group.IsAttachment)
                 distance *= 0.5f;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 5b2316d010..4f5bc05016 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -1841,6 +1841,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             tmp.Y = (float)scale.y;
             tmp.Z = (float)scale.z;
             part.Scale = tmp;
+            part.ParentGroup.HasGroupChanged = true;
             part.SendFullUpdateToAllClients();
         }