diff --git a/res/cardsfolder/a/arm_with_aether.txt b/res/cardsfolder/a/arm_with_aether.txt
index 6b4263a7c90..280e8d47526 100644
--- a/res/cardsfolder/a/arm_with_aether.txt
+++ b/res/cardsfolder/a/arm_with_aether.txt
@@ -3,6 +3,6 @@ ManaCost:2 U
 Types:Sorcery
 A:SP$ AnimateAll | Cost$ 2 U | ValidCards$ Creature.YouCtrl | Triggers$ Trig | sVars$ Eff | SpellDescription$ Until end of turn, creatures you control gain "Whenever this creature deals damage to an opponent, you may return target creature that player controls to its owner's hand."
 SVar:Trig:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | Execute$ Eff | TriggerDescription$ Whenever this creature deals damage to an opponent, you may return target creature that player controls to its owner's hand.
-SVar:Eff:AB$ ChangeZone | Cost$ 0 | ValidTgts$ Creature.DefenderCtrl | TgtPrompt$ Select target creature you don't control. | Origin$ Battlefield | Destination$ Hand
+SVar:Eff:AB$ ChangeZone | Cost$ 0 | ValidTgts$ Creature | TargetsWithDefinedController$ TriggeredTarget | TgtPrompt$ Select target creature that player controls. | Origin$ Battlefield | Destination$ Hand
 SVar:Picture:http://www.wizards.com/global/images/magic/general/arm_with_aether.jpg
 Oracle:Until end of turn, creatures you control gain "Whenever this creature deals damage to an opponent, you may return target creature that player controls to its owner's hand."
\ No newline at end of file
diff --git a/res/cardsfolder/d/deus_of_calamity.txt b/res/cardsfolder/d/deus_of_calamity.txt
index c2bcfe28111..0bfcbae65fb 100644
--- a/res/cardsfolder/d/deus_of_calamity.txt
+++ b/res/cardsfolder/d/deus_of_calamity.txt
@@ -4,6 +4,6 @@ Types:Creature Spirit Avatar
 PT:6/6
 K:Trample
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | DamageAmount$ GE6 | Execute$ TrigDestroy | TriggerDescription$ Whenever CARDNAME deals 6 or more damage to an opponent, destroy target land that player controls.
-SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Land.YouDontCtrl | TgtPrompt$ Select target land opponent controls.
+SVar:TrigDestroy:AB$ Destroy | Cost$ 0 | ValidTgts$ Land | TargetsWithDefinedController$ TriggeredTarget | TgtPrompt$ Select target land opponent controls.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/deus_of_calamity.jpg
 Oracle:Trample\nWhenever Deus of Calamity deals 6 or more damage to an opponent, destroy target land that player controls.
\ No newline at end of file
diff --git a/res/cardsfolder/s/soltari_visionary.txt b/res/cardsfolder/s/soltari_visionary.txt
index 0ddaaa78686..a174de8ade7 100644
--- a/res/cardsfolder/s/soltari_visionary.txt
+++ b/res/cardsfolder/s/soltari_visionary.txt
@@ -3,9 +3,7 @@ ManaCost:1 W W
 Types:Creature Soltari Cleric
 PT:2/2
 K:Shadow
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ You | Execute$ TrigDestroyOwn | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage to a player, destroy target enchantment that player controls.
-SVar:TrigDestroyOwn:AB$Destroy | Cost$ 0 | ValidTgts$ Enchantment.YouCtrl | TgtPrompt$ Select an enchantment that you control.
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | Execute$ TrigDestroyOpp | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Whenever CARDNAME deals damage to a player, destroy target enchantment that player controls.
-SVar:TrigDestroyOpp:AB$Destroy | Cost$ 0 | ValidTgts$ Enchantment.OppCtrl | TgtPrompt$ Select an enchantment your opponent controls.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigDestroy | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage to a player, destroy target enchantment that player controls.
+SVar:TrigDestroy:AB$ Destroy | Cost$ 0 | ValidTgts$ Enchantment | TargetsWithDefinedController$ TriggeredTarget | TgtPrompt$ Select an enchantment that player controls.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/soltari_visionary.jpg
 Oracle:Shadow (This creature can block or be blocked by only creatures with shadow.)\nWhenever Soltari Visionary deals damage to a player, destroy target enchantment that player controls.
\ No newline at end of file
diff --git a/res/cardsfolder/s/stronghold_discipline.txt b/res/cardsfolder/s/stronghold_discipline.txt
index 041b0ce02c9..7f02b794a2c 100644
--- a/res/cardsfolder/s/stronghold_discipline.txt
+++ b/res/cardsfolder/s/stronghold_discipline.txt
@@ -1,10 +1,10 @@
 Name:Stronghold Discipline
 ManaCost:2 B B
 Types:Sorcery
-A:SP$ LoseLife | Cost$ 2 B B | Defined$ Opponent | LifeAmount$ X | References$ X | SubAbility$ DBLoseLife | SpellDescription$ Each player loses 1 life for each creature he or she controls.
-SVar:DBLoseLife:DB$LoseLife | Defined$ You | LifeAmount$ Y | References$ Y
-SVar:X:Count$TypeOppCtrl.Creature
-SVar:Y:Count$TypeYouCtrl.Creature
+A:SP$ RepeatEach | Cost$ 2 B B | RepeatPlayers$ Player | RepeatSubAbility$ DBLoseLife | SpellDescription$ Each player loses 1 life for each creature he or she controls.
+SVar:DBLoseLife:DB$ LoseLife | Defined$ Player.IsRemembered | LifeAmount$ X | References$ X
+SVar:X:Count$Valid Creature.RememberedPlayerCtrl
+SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stronghold_discipline.jpg
 Oracle:Each player loses 1 life for each creature he or she controls.
\ No newline at end of file
diff --git a/res/cardsfolder/s/survival_cache.txt b/res/cardsfolder/s/survival_cache.txt
index 17c7faaa0ff..e512bbe1001 100644
--- a/res/cardsfolder/s/survival_cache.txt
+++ b/res/cardsfolder/s/survival_cache.txt
@@ -5,6 +5,6 @@ K:Rebound
 A:SP$ GainLife | Cost$ 2 W | Defined$ You | LifeAmount$ 2 | SubAbility$ DoDraw | SpellDescription$ You gain 2 life. Then if you have more life than an opponent, draw a card.
 SVar:DoDraw:DB$ Draw | Defined$ You | ConditionCheckSVar$ X | ConditionSVarCompare$ GTY | References$ X,Y | NumCards$ 1
 SVar:X:Count$YourLifeTotal
-SVar:Y:Count$OppLifeTotal
+SVar:Y:PlayerCountOpponents$HighestLifeTotal
 SVar:Picture:http://www.wizards.com/global/images/magic/general/survival_cache.jpg
 Oracle:You gain 2 life. Then if you have more life than an opponent, draw a card.\nRebound (If you cast this spell from your hand, exile it as it resolves. At the beginning of your next upkeep, you may cast this card from exile without paying its mana cost.)
\ No newline at end of file