diff --git a/source/glest_game/main/main.cpp b/source/glest_game/main/main.cpp
index e2c1719d..fab47ba9 100644
--- a/source/glest_game/main/main.cpp
+++ b/source/glest_game/main/main.cpp
@@ -3528,7 +3528,7 @@ int handleCreateDataArchivesCommand(int argc, char** argv) {
 						vector<string> results2;
 						findDirs(techPath + name + "/factions", results2, false,true);
 						if(results2.empty() == false) {
-							string downloadArchive = techPath + name + ".7z";
+							string downloadArchive = techPath + name + fileArchiveExtension;
 
 							//printf("Test downloadArchive [%s]\n",downloadArchive.c_str());
 
@@ -3577,7 +3577,7 @@ int handleCreateDataArchivesCommand(int argc, char** argv) {
 							endPathWithSlash(tilesetPath);
 						}
 						if(fileExists(tilesetPath + name + "/" + name + ".xml") == true) {
-							string downloadArchive = tilesetPath + name + ".7z";
+							string downloadArchive = tilesetPath + name + fileArchiveExtension;
 
 							//printf("Test downloadArchive [%s]\n",downloadArchive.c_str());
 
diff --git a/source/glest_game/type_instances/faction.cpp b/source/glest_game/type_instances/faction.cpp
index 556bf095..f9a832f1 100644
--- a/source/glest_game/type_instances/faction.cpp
+++ b/source/glest_game/type_instances/faction.cpp
@@ -318,7 +318,6 @@ void FactionThread::execute() {
 				break;
 			}
 
-			codeLocation = "4";
 			static string mutexOwnerId = string(__FILE__) + string("_") + intToStr(__LINE__);
             MutexSafeWrapper safeMutex(triggerIdMutex,mutexOwnerId);
             bool executeTask = (this->frameIndex.first >= 0);
@@ -400,7 +399,7 @@ void FactionThread::execute() {
 						if(world->getUnitUpdater() == NULL) {
 							throw megaglest_runtime_error("world->getUnitUpdater() == NULL");
 						}
-						codeLocation = "14";
+
 						world->getUnitUpdater()->updateUnitCommand(unit,currentTriggeredFrameIndex);
 
 						codeLocation = "15";