diff --git a/source/glest_game/ai/path_finder.cpp b/source/glest_game/ai/path_finder.cpp
index 299748b8d..d30256ed9 100644
--- a/source/glest_game/ai/path_finder.cpp
+++ b/source/glest_game/ai/path_finder.cpp
@@ -40,8 +40,8 @@ namespace Glest{ namespace Game{
 const int PathFinder::maxFreeSearchRadius	= 10;
 //const int PathFinder::pathFindNodesMax= 400;
 
-int PathFinder::pathFindNodesAbsoluteMax	= 1200;
-int PathFinder::pathFindNodesMax			= 300;
+int PathFinder::pathFindNodesAbsoluteMax	= 800;
+int PathFinder::pathFindNodesMax			= 400;
 const int PathFinder::pathFindRefresh		= 10;
 const int PathFinder::pathFindBailoutRadius	= 20;
 
diff --git a/source/glest_game/world/world.cpp b/source/glest_game/world/world.cpp
index 24448ae69..3b588d6b1 100644
--- a/source/glest_game/world/world.cpp
+++ b/source/glest_game/world/world.cpp
@@ -286,7 +286,8 @@ void World::updateAllFactionUnits() {
 	Chrono chrono;
 	chrono.start();
 
-	for(;chrono.getMillis() < 10000;) {
+	const int MAX_FACTION_THREAD_WAIT_MILLISECONDS = 20000;
+	for(;chrono.getMillis() < MAX_FACTION_THREAD_WAIT_MILLISECONDS;) {
 		workThreadsFinished = true;
 		for(int i = 0; i < factionCount; ++i) {
 			Faction *faction = getFaction(i);