diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set06/set06-Isengard.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set06/set06-Isengard.hjson
index 0c3f1b8e2..4a77c624a 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set06/set06-Isengard.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set06/set06-Isengard.hjson
@@ -140,12 +140,15 @@
 					filter: bearer
 				}
 				effect: {
-					type: exert
-					player: fp
-					select: choose(companion)
-					count: {
+					type: Repeat
+					times: {
 						type: ForEachSiteYouControl
 					}
+					effect: {
+						type: exert
+						player: fp
+						select: choose(companion)
+					}
 				}
 			}
 		]
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Rohan.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Rohan.hjson
index c4066d8b4..7df4fc605 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Rohan.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Rohan.hjson
@@ -97,7 +97,7 @@
 							true: {
 								type: exert
 								player: free people
-								select: choose(companion)
+								select: choose(minion)
 								count: 0-1
 								memorize: exertedCharacter
 							}
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Ringwraith.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Ringwraith.hjson
index 1fd04c2c5..091d88def 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Ringwraith.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Ringwraith.hjson
@@ -119,10 +119,16 @@
 			{
 				type: activated
 				phase: archery
-				requires: {
-					type: canSpot
-					filter: your,or(enduring,mounted),nazgul
-				}
+				requires: [
+					{
+						type: CanSpot
+						filter: self,Zone(SUPPORT)
+					}
+					{
+						type: canSpot
+						filter: your,or(enduring,mounted),nazgul
+					}
+				]
 				effect: [
 					{
 						type: transfer
@@ -144,6 +150,14 @@
 					filter: bearer
 				}
 			}
+			{
+				type: modifier
+				modifier: {
+					type: CantBear
+					filter: bearer
+					cardFilter: mount
+				}
+			}
 		]
 		gametext: <b>Archery:</b> Spot your enduring or mounted Nazgûl to transfer this condition from your support area to an unbound companion. Discard a mount borne by that companion.<br>Bearer cannot heal or bear mounts.
 		lore: ""
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Sauron.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Sauron.hjson
index 01c29c30c..b10bf202e 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Sauron.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Sauron.hjson
@@ -29,6 +29,7 @@
 					}
 					{
 						type: removeBurdens
+						ignoreCostCheckFailure: true
 						amount: {
 							type: fromMemory
 							memory: chosenCompanion
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set11/set11-Orc.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set11/set11-Orc.hjson
index e8f2afa39..2367cebaf 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set11/set11-Orc.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set11/set11-Orc.hjson
@@ -585,10 +585,16 @@
 				count: 2
 			}
 			effect: [
+				{
+					type: ChooseActiveCards
+					text: Choose a condition to discard
+					select: choose(condition)
+					memorize: chosenCard
+				}
 				{
 					type: preventable
 					player: free people
-					text: Would you like to discard the top 6 cards of your draw deck to prevent discarding a condition?
+					text: Would you like to discard the top 6 cards of your draw deck to prevent discarding {chosenCard}?
 					cost: {
 						type: discardTopCardsFromDeck
 						forced: false
@@ -597,7 +603,7 @@
 					}
 					effect: {
 						type: discard
-						select: choose(condition)
+						select: memory(chosenCard)
 					}
 				}
 			]
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set12/set12-Dwarven.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set12/set12-Dwarven.hjson
index bd089ebb2..0d4402959 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set12/set12-Dwarven.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set12/set12-Dwarven.hjson
@@ -29,7 +29,7 @@
 				}
 				{
 					type: discard
-					select: all(minion,not(race(memory(chosenMinion))))
+					select: all(minion,hasRace,not(race(memory(chosenMinion))))
 				}
 			]
 		}