diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt
index 45097b433..1acc2bb2f 100644
--- a/projects/mtg/bin/Res/sets/primitives/borderline.txt
+++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt
@@ -23633,7 +23633,7 @@ toughness=1
 [card]
 name=Dreadfeast Demon
 abilities=flying
-auto=@each my endofturn restriction{type(creature[-demon]|mybattlefield)~morethan~0}:may name(Sacrifice a creature) target(creature[-demon]|mybattlefield) sacrifice and!( all(this) clone )!
+auto=@each my endofturn restriction{type(creature[-demon]|mybattlefield)~morethan~0}:name(Sacrifice a creature) target(creature[-demon]|mybattlefield) sacrifice and!( all(this) clone )!
 text=Flying -- At the beginning of your end step, sacrifice a non-Demon creature. If you do, create a token that's a copy of Dreadfeast Demon.
 mana={5}{B}{B}
 type=Creature
@@ -60938,7 +60938,7 @@ toughness=3
 [card]
 name=Orzhov Advokist
 auto=@each my upkeep: may lord(creature|opponentBattlefield) cantattack ueot && target(creature|opponentBattlefield) counter(1/1,2)
-auto=@each my upkeep: may lord(creature|myBattlefield) target(creature|myBattlefield) counter(1/1,2)
+auto=@each my upkeep:may target(creature|myBattlefield) counter(1/1,2)
 text=At the beginning of your upkeep, each player may put two +1/+1 counters on a creature they control. If a player does, creatures that player controls can't attack you or a planeswalker you control until your next turn.
 mana={2}{W}
 type=Creature
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 1ebbb1b7d..a5d3610ee 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -8539,8 +8539,8 @@ toughness=7
 [card]
 name=Baleful Stare
 target=opponent
-auto=foreach(mountain|opponenthand) draw:1
-auto=foreach(*[red]|opponenthand) draw:1
+auto=foreach(mountain|opponenthand) draw:1 controller
+auto=foreach(*[red]|opponenthand) draw:1 controller
 auto=reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )! optiononeend revealend
 text=Target opponent reveals his or her hand. You draw a card for each Mountain and red card in it.
 mana={2}{U}
@@ -36055,7 +36055,7 @@ type=Sorcery
 [/card]
 [card]
 name=Energy Chamber
-auto=@each my upkeep:all(this) transforms((,newability[may counter(1/1) target(creature[artifact])],newability[may counter(0/0.1.Charge) target(artifact[-creature])])) ueot
+auto=@each my upkeep:all(this) transforms((,newability[if type(creature[artifact]|myBattlefield)~morethan~0 then choice counter(1/1) target(creature[artifact])],newability[choice counter(0/0.1.Charge) target(artifact[-creature])])) ueot
 text=At the beginning of your upkeep, choose one - Put a +1/+1 counter on target artifact creature; or put a charge counter on target noncreature artifact.
 mana={2}
 type=Artifact