diff --git a/TheWarWithin/HunterBeastMastery.lua b/TheWarWithin/HunterBeastMastery.lua
index 4d1ac351c..8be5beeaf 100644
--- a/TheWarWithin/HunterBeastMastery.lua
+++ b/TheWarWithin/HunterBeastMastery.lua
@@ -1485,6 +1485,7 @@ spec:RegisterAbilities( {
 
         handler = function()
             applyDebuff( "target", "black_arrow" )
+            if talent.death_shade.enabled then applyBuff ( "hunters_prey" ) end
         end,
     },
 
diff --git a/TheWarWithin/ShamanElemental.lua b/TheWarWithin/ShamanElemental.lua
index e80acbb15..d0f7fa2d3 100644
--- a/TheWarWithin/ShamanElemental.lua
+++ b/TheWarWithin/ShamanElemental.lua
@@ -268,6 +268,7 @@ spec:RegisterAuras( {
         type = "Magic",
         max_stack = function() return 9 + 3 * talent.earthen_communion.rank end,
         dot = "buff",
+        friendly = true,
         shared = "player",
         copy = { 383648, 974 }
     },
diff --git a/TheWarWithin/ShamanRestoration.lua b/TheWarWithin/ShamanRestoration.lua
index 9eb241718..d98f3ad31 100644
--- a/TheWarWithin/ShamanRestoration.lua
+++ b/TheWarWithin/ShamanRestoration.lua
@@ -1044,6 +1044,18 @@ spec:RegisterSetting( "experimental_msg", nil, {
     width = "full",
 } )
 
+--[[spec:RegisterSetting( "second_shield", "earth_shield", {
+    name = "|T136082:0|t Preferred 2nd shield",
+    desc = "Specify which shield you want to use alongside water shield when you have talented into Elemental Orbit",
+    type = "select",
+    values = function()
+        return {
+            earth_shield = class.abilityList.earth_shield,
+            lightning_shield = class.abilityList.lightning_shield,
+        }
+    end,
+    width = "normal"
+} )--]]
 
 spec:RegisterRanges( "lightning_bolt", "flame_shock", "wind_shear", "primal_strike" )