diff --git a/forge-gui/res/cardsfolder/c/chaos_lord.txt b/forge-gui/res/cardsfolder/c/chaos_lord.txt
index 2d78639c7a9..800e05c9382 100644
--- a/forge-gui/res/cardsfolder/c/chaos_lord.txt
+++ b/forge-gui/res/cardsfolder/c/chaos_lord.txt
@@ -3,8 +3,8 @@ ManaCost:4 R R R
 Types:Creature Human
 PT:7/7
 K:First Strike
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ EQ0 | Execute$ ChangeControl | TriggerDescription$ At the beginning of your upkeep, target opponent gains control of CARDNAME if the number of permanents is even.
-SVar:ChangeControl:AB$GainControl | Cost$ 0 | Defined$ Self | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | SubAbility$ PutCounter | SpellDescription$ Target opponent gains control of CARDNAME.
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ ChangeControl | TriggerDescription$ At the beginning of your upkeep, target opponent gains control of CARDNAME if the number of permanents is even.
+SVar:ChangeControl:AB$ GainControl | Cost$ 0 | Defined$ Self | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0 | References$ X
 SVar:X:Count$Valid Permanent/Mod.2
 S:Mode$ Continuous | Affected$ Card.Self+notEnteredBattlefieldThisTurn | AddHiddenKeyword$ CARDNAME can attack as though it had haste. | Description$ CARDNAME can attack as though it had haste unless it entered the battlefield this turn.
 SVar:RemAIDeck:True
diff --git a/forge-gui/res/cardsfolder/l/lairwatch_giant.txt b/forge-gui/res/cardsfolder/l/lairwatch_giant.txt
index 2d060131734..88acd196cc3 100644
--- a/forge-gui/res/cardsfolder/l/lairwatch_giant.txt
+++ b/forge-gui/res/cardsfolder/l/lairwatch_giant.txt
@@ -3,7 +3,7 @@ ManaCost:5 W
 Types:Creature Giant Warrior
 PT:5/3
 K:CARDNAME can block an additional creature.
-T:Mode$ Blocks | ValidCard$ Card.Self | CheckSVar$ X | SVarCompare$ GE2 | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME blocks two or more creatures, it gains first strike until end of turn.
+T:Mode$ Blocks | ValidCard$ Card.Self | CheckSVar$ X | NoResolvingCheck$ True | SVarCompare$ GE2 | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME blocks two or more creatures, it gains first strike until end of turn.
 SVar:TrigPump:AB$ Pump | Cost$ 0 | KW$ First Strike | SpellDescription$ CARDNAME gains first strike until end of turn.
 SVar:X:Count$Valid Creature.blockedBySource
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lairwatch_giant.jpg
diff --git a/forge-gui/res/cardsfolder/z/zealous_inquisitor.txt b/forge-gui/res/cardsfolder/z/zealous_inquisitor.txt
index 591bea29efa..7a8ee2996d4 100644
--- a/forge-gui/res/cardsfolder/z/zealous_inquisitor.txt
+++ b/forge-gui/res/cardsfolder/z/zealous_inquisitor.txt
@@ -2,7 +2,7 @@ Name:Zealous Inquisitor
 ManaCost:2 W
 Types:Creature Human Cleric
 PT:2/2
-A:AB$ Effect | Cost$ 1 W | Name$ Inquisitor Redirection | ValidTgts$ Creature | TgtPrompt$ Select target creature you control to redirect the damage to | ReplacementEffects$ InquisitorCombat,InquisitorNonCombat | Triggers$ OutOfSight | SVars$ CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y | References$ InquisitorCombat,InquisitorNonCombat,OutOfSight,CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y | Duration$ HostLeavesOrEOT | ImprintCards$ Self | RememberObjects$ Targeted | SpellDescription$ The next 1 damage that would be dealt to CARDNAME this turn is dealt to target creature instead.
+A:AB$ Effect | Cost$ 1 W | Name$ Inquisitor Redirection | ValidTgts$ Creature | TgtPrompt$ Select target creature  to redirect the damage to | ReplacementEffects$ InquisitorCombat,InquisitorNonCombat | Triggers$ OutOfSight | SVars$ CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y | References$ InquisitorCombat,InquisitorNonCombat,OutOfSight,CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y | Duration$ HostLeavesOrEOT | ImprintCards$ Self | RememberObjects$ Targeted | SpellDescription$ The next 1 damage that would be dealt to CARDNAME this turn is dealt to target creature instead.
 SVar:InquisitorCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | IsCombat$ True | ReplaceWith$ CombatDmg | Description$ The next 1 damage that would be dealt to Zealous Inquisitor this turn is dealt to target creature instead.
 SVar:InquisitorNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | Description$ The next 1 damage that would be dealt to Zealous Inquisitor this turn is dealt to target creature instead.
 SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Remembered | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ 1 | SubAbility$ RestDmgCombat | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1