diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
index feb5fd659c2..78a09cab14c 100644
--- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
+++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
@@ -377,6 +377,7 @@ public final class StaticAbilityContinuous {
         if (layer == StaticAbilityLayer.ABILITIES1 && params.containsKey("GainsAbilitiesOf")) {
             final String[] valids = params.get("GainsAbilitiesOf").split(",");
             List<ZoneType> validZones = new ArrayList<ZoneType>();
+            final boolean loyaltyAB = params.containsKey("GainsLoyaltyAbilities");
             validZones.add(ZoneType.Battlefield);
             if (params.containsKey("GainsAbilitiesOfZones")) {
                 validZones.clear();
@@ -394,6 +395,9 @@ public final class StaticAbilityContinuous {
                 for (Card c : cardsIGainedAbilitiesFrom) {
                     for (SpellAbility sa : c.getSpellAbilities()) {
                         if (sa instanceof AbilityActivated) {
+                            if (loyaltyAB && !sa.getRestrictions().isPwAbility()) {
+                                continue;
+                            }
                             SpellAbility newSA = sa.copy(hostCard, false);
                             if (params.containsKey("GainsAbilitiesLimitPerTurn")) {
                                 newSA.setRestrictions(sa.getRestrictions());
diff --git a/forge-gui/res/cardsfolder/upcoming/jace_arcane_strategist.txt b/forge-gui/res/cardsfolder/upcoming/jace_arcane_strategist.txt
index 7095bdb34f2..f2105df05f4 100644
--- a/forge-gui/res/cardsfolder/upcoming/jace_arcane_strategist.txt
+++ b/forge-gui/res/cardsfolder/upcoming/jace_arcane_strategist.txt
@@ -2,11 +2,10 @@ Name:Jace, Arcane Strategist
 ManaCost:4 U U
 Types:Legendary Planeswalker Jace
 Loyalty:4
-T:Mode$ Drawn | ValidCard$ Card.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | CheckSVar$ X | SVarCompare$ EQ2 | TriggerDescription$ Whenever you draw your second card each turn, put a +1/+1 counter on target creature you control.
+T:Mode$ Drawn | ValidCard$ Card.YouCtrl | Number$ 2 | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever you draw your second card each turn, put a +1/+1 counter on target creature you control.
 SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ P1P1 | CounterNum$ 1
 AI:RemoveDeck:Random
 DeckHas:Ability$Counters
 A:AB$ Draw | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | NumCards$ 1 | Defined$ You | SpellDescription$ Draw a card.
 A:AB$ PumpAll | Cost$ SubCounter<7/LOYALTY> | ValidCards$ Creature.YouCtrl | KW$ HIDDEN Unblockable | SpellDescription$ Creatures you control can't be blocked this turn.
-SVar:X:Count$YouDrewThisTurn
 Oracle:Whenever you draw your second card each turn, put a +1/+1 counter on target creature you control.\n[+1]: Draw a card.\n[-7]: Creatures you control can't be blocked this turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/nicol_bolas_dragon_god.txt b/forge-gui/res/cardsfolder/upcoming/nicol_bolas_dragon_god.txt
index 87c0071cd6f..36f042bf69e 100644
--- a/forge-gui/res/cardsfolder/upcoming/nicol_bolas_dragon_god.txt
+++ b/forge-gui/res/cardsfolder/upcoming/nicol_bolas_dragon_god.txt
@@ -2,7 +2,7 @@ Name:Nicol Bolas, Dragon-God
 ManaCost:U B B B R
 Types:Legendary Planeswalker Bolas
 Loyalty:4
-S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ Battlefield | GainsAbilitiesOf$ Planeswalker.Other | Description$ CARDNAME has all loyalty abilities of all other planeswalkers on the battlefield.
+S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ Battlefield | GainsAbilitiesOf$ Planeswalker.Other | GainsLoyaltyAbilities$ True | Description$ CARDNAME has all loyalty abilities of all other planeswalkers on the battlefield.
 A:AB$ Draw | Cost$ AddCounter<1/LOYALTY> | NumCards$ 1 | SubAbility$ DBChangeZone | Planeswalker$ True | SpellDescription$ You draw a card. Each opponent exiles a card from their hand or a permanent they control.
 SVar:DBChangeZone:DB$ ChangeZone | Origin$ Battlefield,Hand | Destination$ Exile | DefinedPlayer$ Player.Opponent | ChangeType$ Card | ChangeNum$ 1 | Mandatory$ True |
 AI:RemoveDeck:Random