diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index da2dfd09a..fa91f95e1 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -48642,7 +48642,7 @@ name=Invigorate
 target=creature
 auto=4/4
 auto=alternative life:3 opponent
-otherrestriction=type(forest|mybattlefield)~morethan~0
+otherrestriction=type(forest|mybattlefield)~morethan~0,type(*[nolifegain]|opponentbattlefield)~lessthan~1,type(*[nolifegainopponent]|mybattlefield)~lessthan~1
 other={0} name(Have Opponent Gain 3 Life)
 text=If you control a Forest, you may have an opponent gain 3 life rather than pay Invigorate's mana cost. -- Target creature gets +4/+4 until end of turn.
 mana={2}{G}
@@ -109913,7 +109913,10 @@ toughness=5
 [card]
 name=Wall of Shards
 abilities=defender,flying
-auto=@each my upkeep:counter(0/0,1,Age) && all(this) transforms((,newability[choice sacrifice],newability[choice life:counter{0%0.1.Age} opponent]))
+auto=@each my upkeep restriction{type(*[nolifegain]|mybattlefield)~lessthan~1,type(*[nolifegainopponent]|opponentbattlefield)~lessthan~1}:counter(0/0,1,Age) && all(this) transforms((,newability[choice sacrifice],newability[choice life:counter{0%0.1.Age} opponent]))
+auto=@each my upkeep restriction{type(*[nolifegain]|opponentbattlefield)~morethan~0,type(*[nolifegainopponent]|mybattlefield)~lessthan~1}:sacrifice
+auto=@each my upkeep restriction{type(*[nolifegain]|opponentbattlefield)~lessthan~1,type(*[nolifegainopponent]|mybattlefield)~morethan~0}:sacrifice
+auto=@each my upkeep restriction{type(*[nolifegain]|opponentbattlefield)~morethan~0,type(*[nolifegainopponent]|mybattlefield)~morethan~0}:sacrifice
 text=Defender, flying -- Cumulative upkeep - An opponent gains 1 life. (At the beginning of your upkeep, put an age counter on this permanent, then sacrifice it unless you pay its upkeep cost for each age counter on it.)
 mana={1}{W}
 type=Snow Creature