diff --git a/projects/mtg/bin/Res/sets/10E/_cards.dat b/projects/mtg/bin/Res/sets/10E/_cards.dat
index 152bea604..d3f88ecb0 100644
--- a/projects/mtg/bin/Res/sets/10E/_cards.dat
+++ b/projects/mtg/bin/Res/sets/10E/_cards.dat
@@ -812,7 +812,7 @@ toughness=7
 text=Essence Drain deals 3 damage to target creature or player and you gain 3 life.
 target=creature,player
 auto=damage:3
-auto=life:3
+auto=life:3 controller
 id=135191
 name=Essence Drain
 rarity=C
diff --git a/projects/mtg/bin/Res/sets/INV/_cards.dat b/projects/mtg/bin/Res/sets/INV/_cards.dat
index 83bfe13bb..f74bd1f57 100644
--- a/projects/mtg/bin/Res/sets/INV/_cards.dat
+++ b/projects/mtg/bin/Res/sets/INV/_cards.dat
@@ -1828,7 +1828,7 @@ toughness=*
 text=Zap deals 1 damage to target creature or player.     Draw a card.
 target=creature,player
 auto=damage:1
-auto=draw:1
+auto=draw:1 controller
 id=23075
 name=Zap
 color=Red
diff --git a/projects/mtg/bin/Res/sets/LEG/_cards.dat b/projects/mtg/bin/Res/sets/LEG/_cards.dat
index 498f80e24..a908f4448 100644
--- a/projects/mtg/bin/Res/sets/LEG/_cards.dat
+++ b/projects/mtg/bin/Res/sets/LEG/_cards.dat
@@ -1246,7 +1246,7 @@ text=Syphon Soul deals 2 damage to each other player. You gain life equal to the
 id=1458
 target=player
 auto=damage:2
-auto=life:2
+auto=life:2 controller
 name=Syphon Soul
 rarity=C
 type=Sorcery
diff --git a/projects/mtg/bin/Res/sets/POR/_cards.dat b/projects/mtg/bin/Res/sets/POR/_cards.dat
index 264903d87..388f64224 100644
--- a/projects/mtg/bin/Res/sets/POR/_cards.dat
+++ b/projects/mtg/bin/Res/sets/POR/_cards.dat
@@ -1477,7 +1477,7 @@ mana={2}{G}
 text=Vampiric Feast deals 4 damage to target creature or player and you gain 4 life.
 target=creature,player
 auto=damage:4
-auto=life:4
+auto=life:4 controller
 id=4243
 name=Vampiric Feast
 rarity=U
diff --git a/projects/mtg/bin/Res/sets/RAV/_cards.dat b/projects/mtg/bin/Res/sets/RAV/_cards.dat
index ac3dc16c2..d939c8bcd 100644
--- a/projects/mtg/bin/Res/sets/RAV/_cards.dat
+++ b/projects/mtg/bin/Res/sets/RAV/_cards.dat
@@ -119,7 +119,7 @@ abilities=defender
 text=Char deals 4 damage to target creature or player and 2 damage to you.
 target=creature,player
 auto=Damage:4
-auto=life:-2
+auto=damage:2 controller
 id=87942
 name=Char
 color=Red
@@ -508,7 +508,7 @@ type=Instant
 text=Lightning Helix deals 3 damage to target creature or player and you gain 3 life.
 target=creature,player
 auto=Damage:3
-auto=life:3
+auto=life:3 controller
 id=87908
 name=Lightning Helix
 color=Red,White
diff --git a/projects/mtg/bin/Res/sets/SHM/_cards.dat b/projects/mtg/bin/Res/sets/SHM/_cards.dat
index ba7ac7e93..7efc3d2c3 100644
--- a/projects/mtg/bin/Res/sets/SHM/_cards.dat
+++ b/projects/mtg/bin/Res/sets/SHM/_cards.dat
@@ -203,8 +203,8 @@ text=Corrupt deals damage equal to the number of Swamps you control to target cr
 target=creature,player
 id=146013
 target=creature,player
-auto=foreach(swamp|myinplay):damage:1
-auto=foreach(swamp|myinplay)life:1
+auto=foreach(swamp|myinplay) damage:1
+auto=foreach(swamp|myinplay) life:1 controller
 name=Corrupt
 rarity=U
 type=Sorcery
diff --git a/projects/mtg/bin/Res/sets/TSP/_cards.dat b/projects/mtg/bin/Res/sets/TSP/_cards.dat
index 0d5ba80e7..15773dc77 100644
--- a/projects/mtg/bin/Res/sets/TSP/_cards.dat
+++ b/projects/mtg/bin/Res/sets/TSP/_cards.dat
@@ -469,8 +469,8 @@ mana={1}{R}{R}
 type=Instant
 text=Orcish Cannonade deals 2 damage to target creature or player and 3 damage to you. Draw a card.
 target=creature,player
-auto=damage:2 && damage 3 controller
-auto=draw:1
+auto=damage:2 && damage:3 controller
+auto=draw:1 controller
 rarity=C
 [/card]
 [card]
diff --git a/projects/mtg/bin/Res/sets/USG/_cards.dat b/projects/mtg/bin/Res/sets/USG/_cards.dat
index 5a66b3641..c886d2663 100644
--- a/projects/mtg/bin/Res/sets/USG/_cards.dat
+++ b/projects/mtg/bin/Res/sets/USG/_cards.dat
@@ -309,7 +309,8 @@ toughness=1
 text=Corrupt deals damage equal to the number of Swamps you control to target creature or player. You gain life equal to the damage dealt this way.
 id=5853
 target=creature,player
-alias=146013
+auto=foreach(swamp|myinplay) damage:1
+auto=foreach(swamp|myinplay) life:1 controller
 name=Corrupt
 rarity=C
 type=Sorcery