diff --git a/forge-gui/res/cardsfolder/s/sorcerous_spyglass.txt b/forge-gui/res/cardsfolder/s/sorcerous_spyglass.txt
index ad67deb0e03..a5f6ecdaa0e 100644
--- a/forge-gui/res/cardsfolder/s/sorcerous_spyglass.txt
+++ b/forge-gui/res/cardsfolder/s/sorcerous_spyglass.txt
@@ -1,9 +1,11 @@
 Name:Sorcerous Spyglass
 ManaCost:2
 Types:Artifact
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPeek | TriggerDescription$ As CARDNAME enters the battlefield, look at an opponent's hand, then choose any card name.
-SVar:TrigPeek:DB$ RevealHand | ValidTgts$ Opponent | TgtPrompt$ Select an opponent | SubAbility$ DBNameCard
-SVar:DBNameCard:DB$ NameCard | Defined$ You
+K:ETBReplacement:Other:ChoosePlayer
+SVar:ChoosePlayer:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | ChoiceTitle$ Choose an opponent to look at the hand: | SubAbility$ DBLook | SpellDescription$ As CARDNAME enters the battlefield, choose a creature type.
+SVar:DBLook:DB$ RevealHand | Defined$ ChosenPlayer | SubAbility$ DBNameCard
+SVar:DBNameCard:DB$ NameCard | Defined$ You | SubAbility$ DBClear
+SVar:DBClear:DB$ Cleanup | ClearChosenPlayer$ True
 S:Mode$ CantBeActivated | ValidCard$ Card.NamedCard | NonMana$ True | Description$ Activated abilities of sources with the chosen name can't be activated unless they're mana abilities.
 AI:RemoveDeck:Random
 # TODO: Might improve AI logic to support it (the AI needs to pick cards that actually have activated nonmana abilities on them)
diff --git a/forge-gui/res/cardsfolder/t/tishana_voice_of_thunder.txt b/forge-gui/res/cardsfolder/t/tishana_voice_of_thunder.txt
index 7a22bbc3077..ea9a18c4ae3 100644
--- a/forge-gui/res/cardsfolder/t/tishana_voice_of_thunder.txt
+++ b/forge-gui/res/cardsfolder/t/tishana_voice_of_thunder.txt
@@ -1,7 +1,7 @@
 Name:Tishana, Voice of Thunder
 ManaCost:5 G U
 Types:Legendary Creature Merfolk Shaman
-PT:0/0
+PT:*/*
 S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ X | SetToughness$ X | References$ X | Description$ CARDNAME's power and toughness are each equal to the number of cards in your hand.
 S:Mode$ Continuous | Affected$ You | SetMaxHandSize$ Unlimited | Description$ You have no maximum hand size.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card for each creature you control.