Index: ps/trunk/binaries/data/mods/public/simulation/ai/petra/baseManager.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/ai/petra/baseManager.js
+++ ps/trunk/binaries/data/mods/public/simulation/ai/petra/baseManager.js
@@ -801,8 +801,8 @@
 		if (target.hasClass("Fortress") || target.hasClass("Wonder") ||
 		    target.getMetadata(PlayerID, "phaseUp") == true)
 			targetNB = 7;
-		else if (target.hasClass("Barracks") || target.hasClass("DefenseTower") ||
-		         target.hasClass("Market"))
+		else if (target.hasClass("Barracks") || target.hasClass("Range") || target.hasClass("Stable") ||
+		         target.hasClass("DefenseTower") || target.hasClass("Market"))
 			targetNB = 4;
 		else if (target.hasClass("House") || target.hasClass("DropsiteWood"))
 			targetNB = 3;
Index: ps/trunk/binaries/data/mods/public/simulation/ai/petra/headquarters.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/ai/petra/headquarters.js
+++ ps/trunk/binaries/data/mods/public/simulation/ai/petra/headquarters.js
@@ -1922,8 +1922,7 @@
 	let barracksTemplate = this.canBuild(gameState, "structures/{civ}_barracks") ? "structures/{civ}_barracks" : undefined;
 
 	let rangeTemplate = this.canBuild(gameState, "structures/{civ}_range") ? "structures/{civ}_range" : undefined;
-	let numRanges = gameState.getOwnEntitiesByClass("Archery", true).length;
-	numBarracks -= numRanges;
+	let numRanges = gameState.getOwnEntitiesByClass("Range", true).length;
 
 	let stableTemplate = this.canBuild(gameState, "structures/{civ}_stables") ? "structures/{civ}_stables" :
 	                     this.canBuild(gameState, "structures/{civ}_stable") ? "structures/{civ}_stable" : undefined;