diff --git a/source/glest_game/game/commander.cpp b/source/glest_game/game/commander.cpp
index 9ead4360..d82ffe83 100644
--- a/source/glest_game/game/commander.cpp
+++ b/source/glest_game/game/commander.cpp
@@ -787,8 +787,8 @@ void Commander::giveNetworkCommand(NetworkCommand* networkCommand) const {
         	commandWasHandled = true;
 
         	bool pauseGame 			= networkCommand->getUnitId() != 0;
-        	bool clearCaches 		= networkCommand->getCommandTypeId();
-        	bool joinNetworkGame 	= networkCommand->getUnitTypeId();
+        	bool clearCaches 		= (networkCommand->getCommandTypeId() == 1);
+        	bool joinNetworkGame 	= (networkCommand->getUnitTypeId() == 1);
        		Game *game = this->world->getGame();
 
        		//printf("nctPauseResume pauseGame = %d\n",pauseGame);
diff --git a/source/glest_game/game/script_manager.cpp b/source/glest_game/game/script_manager.cpp
index 7f26de37..0a2089bd 100644
--- a/source/glest_game/game/script_manager.cpp
+++ b/source/glest_game/game/script_manager.cpp
@@ -1933,7 +1933,7 @@ void ScriptManager::unregisterDayNightEvent() {
 
 void ScriptManager::onDayNightTriggerEvent() {
 	if(registeredDayNightEvent == true) {
-		bool isDay = this->getIsDayTime();
+		bool isDay = (this->getIsDayTime() == 1);
 		if((lastDayNightTriggerStatus != 1 && isDay == true) ||
 			(lastDayNightTriggerStatus != 2 && isDay == false)) {
 			if(isDay == true) {
diff --git a/source/glest_game/main/main.cpp b/source/glest_game/main/main.cpp
index d50017c0..6e52e81f 100644
--- a/source/glest_game/main/main.cpp
+++ b/source/glest_game/main/main.cpp
@@ -3531,7 +3531,6 @@ int glestMain(int argc, char** argv) {
 		setupGameItemPaths(argc, argv, &config);
 
 		if(config.getString("PlayerId","") == "") {
-			Shared::Util::uuid_t u;
 			char  uuid_str[38];
 			get_uuid_string(uuid_str,sizeof(uuid_str));