diff --git a/data/schema/core/actionwml.cfg b/data/schema/core/actionwml.cfg
index 56cfb9f8fcf8..59fa1e6d0ad3 100644
--- a/data/schema/core/actionwml.cfg
+++ b/data/schema/core/actionwml.cfg
@@ -209,7 +209,7 @@
 		max=infinite
 		super="$filter_location"
 		{INSERT_TAG}
-		{REQUIRED_KEY terrain terrain_code}
+		{REQUIRED_KEY terrain s_terrain_code}
 		{DEFAULT_KEY layer terrain_layer both}
 		{DEFAULT_KEY replace_if_failed s_bool no}
 	[/tag]
@@ -1209,7 +1209,7 @@
 		name="random_placement"
 		max=infinite
 		{INSERT_TAG}
-		{REQUIRED_KEY num_items f_unsigned}
+		{REQUIRED_KEY num_items f_unsigned,s_unsigned}
 		{REQUIRED_KEY variable string}
 		{DEFAULT_KEY min_distance s_unsigned 0}
 		{DEFAULT_KEY allow_less s_bool no}
diff --git a/data/schema/game_config.cfg b/data/schema/game_config.cfg
index 0e22aad917fb..4794c776b003 100644
--- a/data/schema/game_config.cfg
+++ b/data/schema/game_config.cfg
@@ -382,6 +382,7 @@
     [/type]
     {SUBST_TYPE coordinates}
     {SUBST_TYPE range_list}
+    {SUBST_TYPE terrain_code}
     [tag]
         name="root"
         min=1