diff --git a/WeakAuras/BuffTrigger2.lua b/WeakAuras/BuffTrigger2.lua
index 61d37ca..afb8b63 100644
--- a/WeakAuras/BuffTrigger2.lua
+++ b/WeakAuras/BuffTrigger2.lua
@@ -140,11 +140,11 @@ Private.ExecEnv.UnitInRangeFixed = UnitInRangeFixed
 
 local function UnitInSubgroupOrPlayer(unit, includePets)
   if includePets == nil then
-    return UnitIsUnit("player", unit)
+    return UnitInParty(unit) or UnitIsUnit("player", unit)
   elseif includePets == "PlayersAndPets" then
-    return UnitIsUnit("player", unit) or UnitIsUnit("pet", unit)
+    return UnitInParty(WeakAuras.petUnitToUnit[unit] or unit) or UnitIsUnit("player", unit) or UnitIsUnit("pet", unit)
   elseif includePets == "PetsOnly" then
-    return UnitIsUnit("pet", unit)
+    return UnitInParty(WeakAuras.petUnitToUnit[unit]) or UnitIsUnit("pet", unit)
   end
 end
 
diff --git a/WeakAuras/WeakAuras.lua b/WeakAuras/WeakAuras.lua
index e47845e..df4305a 100644
--- a/WeakAuras/WeakAuras.lua
+++ b/WeakAuras/WeakAuras.lua
@@ -1083,7 +1083,7 @@ Broker_WeakAuras = LDB:NewDataObject("WeakAuras", {
         WeakAuras.OpenOptions();
       end
     elseif(button == 'MiddleButton') then
-      Private.ToggleMinimap();
+      WeakAuras.ToggleMinimap();
     else
       WeakAuras.RealTimeProfilingWindow:Toggle()
     end
@@ -1648,7 +1648,7 @@ local function UnloadAll()
       Private.CancelAnimation(Private.regions[id].region, true, true, true, true, true, true)
     end
     if clones[id] then
-      for _, region in pairs(clones[id]) do
+      for cloneId, region in pairs(clones[id]) do
         Private.CancelAnimation(region, true, true, true, true, true, true)
       end
     end