diff --git a/mods/ra/tilesets/desert.yaml b/mods/ra/tilesets/desert.yaml
index c7307ff370..1c0cfc58f2 100644
--- a/mods/ra/tilesets/desert.yaml
+++ b/mods/ra/tilesets/desert.yaml
@@ -782,10 +782,6 @@ Templates:
 			3: Clear
 			4: Clear
 			5: Clear
-			6: Clear
-			7: Clear
-			8: Clear
-			9: Clear
 	Template@73:
 		Id: 73
 		Image: rv26
diff --git a/mods/ra/tilesets/snow.yaml b/mods/ra/tilesets/snow.yaml
index 6da825e6a3..d98be93fec 100644
--- a/mods/ra/tilesets/snow.yaml
+++ b/mods/ra/tilesets/snow.yaml
@@ -74,6 +74,7 @@ Templates:
 		Image: clear1
 		Size: 1,1
 		Category: Terrain
+		PickAny: True
 		Tiles:
 			0: Clear
 			1: Clear
@@ -96,6 +97,7 @@ Templates:
 		Image: clear1
 		Size: 1,1
 		Category: Terrain
+		PickAny: True
 		Tiles:
 			0: Clear
 			1: Clear
@@ -2364,7 +2366,7 @@ Templates:
 	Template@116:
 		Id: 116
 		Image: rv05
-		Size: 3,2
+		Size: 3,3
 		Category: River
 		Tiles:
 			0: Clear
@@ -2486,7 +2488,6 @@ Templates:
 		Tiles:
 			0: Rock
 			1: River
-			2: Rock
 	Template@230:
 		Id: 230
 		Image: rv15
@@ -2495,7 +2496,6 @@ Templates:
 		Tiles:
 			0: Rock
 			1: River
-			2: Rock
 	Template@235:
 		Id: 235
 		Image: br1a
diff --git a/mods/ra/tilesets/temperat.yaml b/mods/ra/tilesets/temperat.yaml
index b20d883d71..0cb4d15473 100644
--- a/mods/ra/tilesets/temperat.yaml
+++ b/mods/ra/tilesets/temperat.yaml
@@ -2366,7 +2366,7 @@ Templates:
 	Template@116:
 		Id: 116
 		Image: rv05
-		Size: 3,2
+		Size: 3,3
 		Category: River
 		Tiles:
 			0: Clear
@@ -2488,7 +2488,6 @@ Templates:
 		Tiles:
 			0: Rock
 			1: River
-			2: Rock
 	Template@230:
 		Id: 230
 		Image: rv15
@@ -2497,7 +2496,6 @@ Templates:
 		Tiles:
 			0: Rock
 			1: River
-			2: Rock
 	Template@235:
 		Id: 235
 		Image: br1a