diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/yuletide/set01-Dwarven-errata-playtest.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/yuletide/set01-Dwarven-errata-playtest.hjson
index 510e61d10..ddf78d354 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/yuletide/set01-Dwarven-errata-playtest.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/yuletide/set01-Dwarven-errata-playtest.hjson
@@ -42,28 +42,40 @@
 			}
 			effect: [
 				{
-					type: ChooseActiveCards
-					filter: choose(minion)
-					memorize: chosenMinion
-					count: 0-1
-					text: Choose a minion to make strength -1 until regroup
-				}
-				{
-					type: Preventable
-					player: OwnerFromMemory(chosenMinion)
-					text: Would you like to discard the bottom 2 cards of your draw deck to prevent {chosenMinion} being strength -1 until regroup?
-					cost: {
-						type: discardBottomCardsFromDeck
-						deck: OwnerFromMemory(chosenMinion)
-						count: 2
-						forced: false
-					}
-					effect: {
-						type: ModifyStrength
-						amount: -1
-						filter: memory(chosenMinion)
-						until: start(regroup)
+					# Need to check for minions first, else if this was the last
+					# minion on the table, it defaults to asking freeps to make
+					# the choice.
+					type: Conditional
+					requires: {
+						type: CanSpot
+						filter: minion
 					}
+					effect: [
+						{
+							type: ChooseActiveCards
+							filter: choose(minion)
+							memorize: chosenMinion
+							count: 0-1
+							text: Choose a minion to make strength -1 until regroup
+						}
+						{
+							type: Preventable
+							player: OwnerFromMemory(chosenMinion)
+							text: Would you like to discard the bottom 2 cards of your draw deck to prevent {chosenMinion} being strength -1 until regroup?
+							cost: {
+								type: discardBottomCardsFromDeck
+								deck: OwnerFromMemory(chosenMinion)
+								count: 2
+								forced: false
+							}
+							effect: {
+								type: ModifyStrength
+								amount: -1
+								filter: memory(chosenMinion)
+								until: start(regroup)
+							}
+						}
+					]
 				}
 			]
 		}
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/yuletide/set01-Gandalf-errata-playtest.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/yuletide/set01-Gandalf-errata-playtest.hjson
index f3f48e287..81a1e93eb 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/yuletide/set01-Gandalf-errata-playtest.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/yuletide/set01-Gandalf-errata-playtest.hjson
@@ -42,40 +42,33 @@
 				type: exert
 				filter: self
 			}
-			effect: {
-				type: CostToEffect
-				cost: {
-					type: exert
-					filter: self
+			effect: [
+				{
+					type: ChooseCardsFromDiscard
+					count: 1
+					filter: choose(culture(gandalf),event)
+					memorize: firstEvent
+					text: Choose first {gandalf} event from discard
 				}
-				effect: [
-					{
-						type: ChooseCardsFromDiscard
-						count: 1
-						filter: choose(culture(gandalf),event)
-						memorize: firstEvent
-						text: Choose first {gandalf} event from discard
-					}
-					{
-						type: ChooseCardsFromDiscard
-						count: 1
-						filter: choose(culture(gandalf),event,not(NameFromMemory(firstEvent)))
-						memorize: secondEvent
-						text: Choose second {gandalf} event from discard
-					}
-					{
-						type: PutCardsFromDiscardIntoHand
-						count: 1
-						filter: choose(or(memory(firstEvent),memory(secondEvent)))
-						memorize: retrievedEvent
-					}
-					{
-						type: RemoveCardsInDiscardFromGame
-						count: 1
-						filter: choose(not(memory(retrievedEvent)),or(memory(firstEvent),memory(secondEvent)))
-					}
-				]
-			}
+				{
+					type: ChooseCardsFromDiscard
+					count: 1
+					filter: choose(culture(gandalf),event,not(NameFromMemory(firstEvent)))
+					memorize: secondEvent
+					text: Choose second {gandalf} event from discard
+				}
+				{
+					type: PutCardsFromDiscardIntoHand
+					count: 1
+					filter: choose(or(memory(firstEvent),memory(secondEvent)))
+					memorize: retrievedEvent
+				}
+				{
+					type: RemoveCardsInDiscardFromGame
+					count: 1
+					filter: choose(not(memory(retrievedEvent)),or(memory(firstEvent),memory(secondEvent)))
+				}
+			]
 		}
 		gametext: <b>Fellowship:</b> Exert Barliman Butterbur to reveal 2 [gandalf] events of different titles from your discard pile.  Take 1 into hand and remove the other from the game.
 		lore: “‘You don't know much even about them, if you think old Barliman is stupid,' said Gandalf. ‘He is wise enough on his own ground.'”
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/yuletide/set101-Gandalf-errata-playtest.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/yuletide/set101-Gandalf-errata-playtest.hjson
index 80885f0d2..73e239ca2 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/yuletide/set101-Gandalf-errata-playtest.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/yuletide/set101-Gandalf-errata-playtest.hjson
@@ -51,10 +51,10 @@
 				}
 				cost: {
 					type: exert
-					filter: choose(name(Gandalf))
+					filter: self
 				}
 				effect: {
-					type: shuffleCardsFromDiscardIntoDrawDeck
+					type: PutCardsFromDiscardIntoHand
 					filter: choose(event,or(culture(gandalf),culture(elven)))
 				}
 			}