Index: ps/trunk/binaries/data/mods/public/maps/random/elephantine.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/random/elephantine.js
+++ ps/trunk/binaries/data/mods/public/maps/random/elephantine.js
@@ -71,8 +71,8 @@
 const oPyramid = "structures/kush/pyramid_large";
 const oTowers = new Array(2).fill("uncapturable|structures/kush/sentry_tower").concat(["uncapturable|structures/kush/defense_tower"]);
 
-const oHeroes = Engine.FindTemplates("units/", true).filter(templateName => templateName.startsWith("units/kush/hero_"));
-const oUnits = Engine.FindTemplates("units/", false).filter(templateName =>
+const oHeroes = Engine.FindTemplates("units/kush/", true).filter(templateName => templateName.startsWith("units/kush/hero_"));
+const oUnits = Engine.FindTemplates("units/kush/", false).filter(templateName =>
 	templateName.startsWith("units/kush/") &&
 	oHeroes.every(heroTemplateName => heroTemplateName != templateName) &&
 	Engine.GetTemplate(templateName).Identity.VisibleClasses._string.split(" ").some(type => ["Soldier", "Healer", "Female"].indexOf(type) != -1));
Index: ps/trunk/binaries/data/mods/public/maps/random/rmgen-common/wall_builder.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/random/rmgen-common/wall_builder.js
+++ ps/trunk/binaries/data/mods/public/maps/random/rmgen-common/wall_builder.js
@@ -149,7 +149,7 @@
 	// Defaults to a wall tower piece
 	const quarterBend = Math.PI / 2;
 	let wallset = g_WallStyles[style];
-	let civ = style.split("/")[1];
+	let civ = style.split("/")[0];
 	let ret = wallset.tower ? clone(wallset.tower) : { "angle": 0, "bend": 0, "length": 0, "indent": 0 };
 
 	switch (element)