diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/PC_Cards.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/PC_Cards.js
index 740938dc3..938b0451a 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/PC_Cards.js
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/PC_Cards.js
@@ -983,6 +983,10 @@ var PCCards = {
 	// Pale Crown FA
 	'101_104' : 'https://i.lotrtcgpc.net/promos/LOTR-ENV1U039.0_card.jpg',
 	// V2 Saruman FA
-	'102_100': 'https://i.lotrtcgpc.net/promos/LOTR-ENV2U029.0_card.jpg'
+	'102_100': 'https://i.lotrtcgpc.net/promos/LOTR-ENV2U029.0_card.jpg',
+	// FA Sam, Great Elf Warrior
+	'10_129': 'https://i.lotrtcgpc.net/promos/LOTR-EN10U122.0_card.jpg',
+	// July 2025 WC Circuit: FA Mumak Commander, GATS
+	'15_211': 'https://i.lotrtcgpc.net/promos/LOTR-EN15U086.0_card.jpg'
 }
 
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/blueprintMapping.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/blueprintMapping.txt
index ad062a477..3cb5fef22 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/blueprintMapping.txt
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/blueprintMapping.txt
@@ -417,4 +417,8 @@ gl_theOneRing,1_2
 #2025 WC Circuit: Pale Crown
 101_104,101_39
 #June 2025 WC Circuit: V2 Saruman
-102_100,102_29
\ No newline at end of file
+102_100,102_29
+#FA Sam, Great Elf Warrior
+10_129,10_122
+#July 2025 WC Circuit: FA Mumak Commander, GATS
+15_211,15_86
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set03/set03-Dwarven.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set03/set03-Dwarven.hjson
index dcc87dcd9..ce6c2bf66 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set03/set03-Dwarven.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set03/set03-Dwarven.hjson
@@ -23,7 +23,7 @@
 			}
 			requires: {
 				type: location
-				filter: siteNumber(4-100)
+				filter: siteNumber(4-100), SiteBlock(Fellowship)
 			}
 			effect: {
 				type: drawCards
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 b10bf202e..cf5be2dea 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
@@ -31,7 +31,7 @@
 						type: removeBurdens
 						ignoreCostCheckFailure: true
 						amount: {
-							type: fromMemory
+							type: TwilightCostInMemory
 							memory: chosenCompanion
 						}
 					}
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Ringwraith.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Ringwraith.hjson
index d9afc525f..299753ec8 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Ringwraith.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Ringwraith.hjson
@@ -343,7 +343,7 @@
 				optional: true
 				trigger: {
 					type: winsSkirmish
-					filter: self
+					filter: self, InFierceSkirmish
 				}
 				effect: {
 					type: repeat
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set18/set18-Sites-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set18/set18-Sites-errata.hjson
index 992898c22..6c52f056e 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set18/set18-Sites-errata.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set18/set18-Sites-errata.hjson
@@ -72,6 +72,7 @@
 		type: Site
 		block: Shadows
 		direction: Left
+		keywords: River
 		effects: [
 			{
 				type: Trigger
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/product/PC-Packs.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/PC-Packs.hjson
index e18ea41e6..65693d9b4 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/product/PC-Packs.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/PC-Packs.hjson
@@ -185,6 +185,10 @@
 			#1x101_104
 			// V2 Saruman FA
 			1x102_100
+			#FA Sam, Great Elf Warrior
+			#1x10_129
+			#July 2025 WC Circuit: FA Mumak Commander, GATS
+			1x15_211
 		]
 	}
 	
@@ -292,6 +296,10 @@
 			#1x101_104
 			// V2 Saruman FA
 			1x102_100
+			#FA Sam, Great Elf Warrior
+			#1x10_129
+			#July 2025 WC Circuit: FA Mumak Commander, GATS
+			1x15_211
 		]
 	}