diff --git a/forge-gui/res/cardsfolder/h/hurkyls_prodigy.txt b/forge-gui/res/cardsfolder/h/hurkyls_prodigy.txt
index 9c22db7d020..2975dbada3d 100644
--- a/forge-gui/res/cardsfolder/h/hurkyls_prodigy.txt
+++ b/forge-gui/res/cardsfolder/h/hurkyls_prodigy.txt
@@ -7,8 +7,8 @@ SVar:TrigToken:DB$ Token | TokenTapped$ True | TokenScript$ c_a_powerstone
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigUnblockable | TriggerDescription$ Whenever CARDNAME attacks, you may pay {3}. If you do, CARDNAME can't be blocked this turn and it perpetually gets +2/+0.
 SVar:TrigUnblockable:AB$ Effect | Cost$ 3 | StaticAbilities$ Unblockable | SubAbility$ DBEffect
 SVar:DBEffect:DB$ Effect | StaticAbilities$ PerpetualPump | Duration$ Permanent | Name$ Hurkyl's Prodigy's Perpetual Effect
-SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ This creature can't be blocked.
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.EffectSource | Description$ This creature can't be blocked.
 SVar:PerpetualPump:Mode$ Continuous | Affected$ Card.EffectSource | AddPower$ 2 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ EFFECTSOURCE perpetually gets +2/+0.
 SVar:HasAttackEffect:TRUE
 DeckHas:Ability$Token & Type$Artifact|Powerstone
-Oracle:When Hurkyl's Prodigy enter the battlefield, create a tapped Powerstone token.\nWhenever Hurkyl's Prodigy attacks, you may pay {3}. If you do, Hurkyl's Prodigy can't be blocked this turn and it perpetually gets +2/+0.
+Oracle:When Hurkyl's Prodigy enter the battlefield, create a tapped Powerstone token.\nWhenever Hurkyl's Prodigy attacks, you may pay {3}. If you do, Hurkyl's Prodigy can't be blocked this turn and it perpetually gets +2/+0.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/s/skyline_savior.txt b/forge-gui/res/cardsfolder/s/skyline_savior.txt
index 16a848f3387..c2d9d8a75c5 100644
--- a/forge-gui/res/cardsfolder/s/skyline_savior.txt
+++ b/forge-gui/res/cardsfolder/s/skyline_savior.txt
@@ -5,7 +5,7 @@ PT:3/4
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, return a permanent you control to its owner's hand. If it's a non-Angel creature card, it perpetually gets +1/+1, gains flying, and becomes an Angel in addition to its other types.
 SVar:TrigChange:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Hidden$ True | Mandatory$ True | ChangeType$ Permanent.YouCtrl | RememberChanged$ True | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | RememberObjects$ Remembered | StaticAbilities$ PerpetualAbility | Duration$ Permanent | Triggers$ Update | Name$ Skyline Savior's Perpetual Effect | ConditionDefined$ Remembered | ConditionPresent$ Creature+nonAngel | SubAbility$ DBCleanup
+SVar:DBEffect:DB$ Effect | RememberObjects$ Remembered | StaticAbilities$ PerpetualAbility | Duration$ Permanent | Triggers$ Update | Name$ Skyline Savior's Perpetual Effect | ConditionDefined$ Remembered | ConditionPresent$ Creature.nonAngel | SubAbility$ DBCleanup
 SVar:PerpetualAbility:Mode$ Continuous | Affected$ Card.IsRemembered | AddPower$ 1 | AddToughness$ 1 | AddType$ Angel | AddKeyword$ Flying | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ This creature perpetually gets +1/+1, gains flying, and becomes an Angel in addition to its other types.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Update:Mode$ ChangesZone | Origin$ Any | Destination$ Any | Static$ True | ValidCard$ Card.IsRemembered | Execute$ DBUpdate
diff --git a/forge-gui/res/cardsfolder/upcoming/mephidross_slime.txt b/forge-gui/res/cardsfolder/upcoming/mephidross_slime.txt
index b36585a0150..76827c84951 100644
--- a/forge-gui/res/cardsfolder/upcoming/mephidross_slime.txt
+++ b/forge-gui/res/cardsfolder/upcoming/mephidross_slime.txt
@@ -7,7 +7,7 @@ T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$
 SVar:TrigConjure:DB$ MakeCard | Conjure$ True | Name$ Mephidross Slime | Amount$ 1 | Zone$ Graveyard | RememberMade$ True | SubAbility$ DBEffect
 SVar:DBEffect:DB$ Effect | Name$ Mephidross Slime's Perpetual Effect | RememberObjects$ Remembered | ImprintCards$ TriggeredCard | StaticAbilities$ PerpetualDouble | Duration$ Permanent | SubAbility$ ShuffleIntoLibrary 
 SVar:PerpetualDouble:Mode$ Continuous | Affected$ Card.IsRemembered,Card.IsImprinted | AddPower$ AffectedX | AddToughness$ AffectedY | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ Perpetually double the power and toughness of this creature.
-SVar:ShuffleIntoLibrary:DB$ ChangeZoneAll | Origin$ Graveyard | Destination$ Library | ChangeType$ Card.Self,Card.IsRemembered | SubAbility$ DBCleanup
+SVar:ShuffleIntoLibrary:DB$ ChangeZoneAll | Origin$ Graveyard | Shuffle$ True | Destination$ Library | ChangeType$ Card.Self,Card.IsRemembered | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearImprinted$ True
 SVar:AffectedX:Count$CardPower
 SVar:AffectedY:Count$CardToughness