diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt
index 665cd3cc1..e7524009c 100644
--- a/projects/mtg/bin/Res/sets/primitives/borderline.txt
+++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt
@@ -3855,11 +3855,11 @@ toughness=5
 [card]
 name=Archon of Cruelty
 abilities=flying
-auto=ability$!name(Sacrifice creature or planeswalker) name(Sacrifice creature or planeswalker) target(*[creature;planeswalker]|mybattlefield) sacrifice!$ opponent
-auto=ability$!name(Discard a card) name(Discard a card) target(*|myhand) reject!$ opponent
+auto=ability$!name(Sacrifice creature or planeswalker) name(Sacrifice creature or planeswalker) notAtarget(*[creature;planeswalker]|mybattlefield) sacrifice!$ opponent
+auto=ability$!name(Discard a card) name(Discard a card) notAtarget(*|myhand) reject!$ opponent
 auto=life:-3 opponent && life:3 controller && draw:1 controller
-auto=_ATTACKING_ability$!name(Sacrifice creature or planeswalker) name(Sacrifice creature or planeswalker) target(*[creature;planeswalker]|mybattlefield) sacrifice!$ opponent
-auto=_ATTACKING_ability$!name(Discard a card) name(Discard a card) target(*|myhand) reject!$ opponent
+auto=_ATTACKING_ability$!name(Sacrifice creature or planeswalker) name(Sacrifice creature or planeswalker) notAtarget(*[creature;planeswalker]|mybattlefield) sacrifice!$ opponent
+auto=_ATTACKING_ability$!name(Discard a card) name(Discard a card) notAtarget(*|myhand) reject!$ opponent
 auto=_ATTACKING_life:-3 opponent && life:3 controller && draw:1 controller
 text=Flying -- Whenever Archon of Cruelty enters the battlefield or attacks, target opponent sacrifices a creature or planeswalker, discards a card, and loses 3 life. You draw a card and gain 3 life.
 mana={6}{B}{B}
@@ -46010,7 +46010,7 @@ toughness=3
 name=Horned Stoneseeker
 abilities=menace
 auto=name(Create powerstone) token(Powerstone) and!( tap(noevent) )!
-auto=@movedto(*|nonbattlezone) from(mybattlefield):name(Sacrifice powerstone) target(powerstone|mybattlefield) sacrifice
+auto=@movedto(this|nonbattlezone) from(mybattlefield):name(Sacrifice powerstone) target(powerstone|mybattlefield) sacrifice
 text=Menace -- When Horned Stoneseeker enters the battlefield, create a tapped Powerstone token. (It's an artifact with "{T}: Add {C}. This mana can't be spent to cast a nonartifact spell.") -- When Horned Stoneseeker leaves the battlefield, sacrifice a Powerstone.
 mana={1}{R}
 type=Creature
@@ -57337,7 +57337,7 @@ toughness=2
 name=Loch Dragon
 abilities=flying
 auto=may ability$!name(discard) _DISCARD&DRAW_ !$ controller
-auto=_ATTACKING_may ability$!name(discard) reject notatarget(*|myhand) and!(draw:1) controller!$
+auto=_ATTACKING_may ability$!name(discard) _DISCARD&DRAW_ !$ controller
 text=Flying -- Whenever Loch Dragon enters the battlefield or attacks, you may discard a card. If you do, draw a card.
 mana={UR}{UR}{UR}{UR}
 type=Creature
@@ -66178,7 +66178,7 @@ name=Nim Deathmantle
 auto={4}:equip
 auto=teach(creature) 2/2
 auto=teach(creature) transforms((Zombie,newcolors[black],newability[intimidate]))
-auto=@movedTo(*[-token]|mygraveyard) from(battlefield):all(trigger[to]) transforms((,newability[pay[[{4}]] moveTo(mybattlefield)])) and!(rehook)!
+auto=@movedTo(creature[-token]|mygraveyard) from(battlefield):all(trigger[to]) transforms((,newability[pay[[{4}]] moveTo(mybattlefield)])) and!(rehook)!
 text=Equipped creature gets +2/+2, has intimidate, and is a black Zombie. -- Whenever a nontoken creature is put into your graveyard from the battlefield, you may pay {4}. If you do, return that card to the battlefield and attach Nim Deathmantle to it. -- Equip {4}
 mana={2}
 type=Artifact
@@ -89815,7 +89815,7 @@ toughness=4
 [/card]
 [card]
 name=Smothering Tithe
-auto=@drawfoeof(player):ability$!name(pay or create treasure) pay[[{2}]] donothing?token(Treasure) opponent!$ opponent
+auto=@drawfoeof(player):ability$!name(pay or create treasure) pay[[{2}]] donothing?token(Treasure) controller!$ opponent
 text=Whenever an opponent draws a card, that player may pay {2} . If the player doesn't, you create a Treasure token. (It's an artifact with " {T}, Sacrifice this artifact: Add one mana of any color.")
 mana={3}{W}
 type=Enchantment
@@ -91364,7 +91364,7 @@ subtype=Aura
 [/card]
 [card]
 name=Spectral Hunt-Caller
-auto={5}{G}:all(other creature|myBattlefield) 1/1 && all(other creature|myBattlefield) trample
+auto={5}{G}:all(creature|myBattlefield) 1/1 && all(creature|myBattlefield) trample
 text={5}{G}: Creatures you control get +1/+1 and gain trample until end of turn.
 mana={4}{G}
 type=Creature