diff --git a/source/glest_game/game/script_manager.cpp b/source/glest_game/game/script_manager.cpp
index 1f2d7cb1..55975a38 100644
--- a/source/glest_game/game/script_manager.cpp
+++ b/source/glest_game/game/script_manager.cpp
@@ -464,6 +464,7 @@ bool ScriptManager::getAiEnabled(int factionIndex){
 	if(factionIndex<GameConstants::maxPlayers){
 		return playerModifiers[factionIndex].getAiEnabled();
 	}
+	return false;
 }
 
 void ScriptManager::disableConsume(int factionIndex){
@@ -484,9 +485,10 @@ void ScriptManager::enableConsume(int factionIndex){
 
 bool ScriptManager::getConsumeEnabled(int factionIndex){
 	ScriptManager_STREFLOP_Wrapper streflopWrapper;
-	if(factionIndex<GameConstants::maxPlayers){
+	if(factionIndex < GameConstants::maxPlayers){
 		return playerModifiers[factionIndex].getConsumeEnabled();
 	}
+	return false;
 }
 
 int ScriptManager::registerCellTriggerEventForUnitToUnit(int sourceUnitId, int destUnitId) {
diff --git a/source/glest_game/world/unit_updater.cpp b/source/glest_game/world/unit_updater.cpp
index 847fe241..2d6d5c70 100644
--- a/source/glest_game/world/unit_updater.cpp
+++ b/source/glest_game/world/unit_updater.cpp
@@ -613,7 +613,7 @@ void UnitUpdater::updateHarvest(Unit *unit) {
 				if (canHarvestDestPos == true) {
 					unit->setLastHarvestResourceTarget(NULL);
 
-					canHarvestDestPos == (map->getSurfaceCell(Map::toSurfCoords(targetPos)) != NULL && map->getSurfaceCell(Map::toSurfCoords(targetPos))->getResource() != NULL && map->getSurfaceCell(Map::toSurfCoords(targetPos))->getResource()->getType() != NULL);
+					canHarvestDestPos = (map->getSurfaceCell(Map::toSurfCoords(targetPos)) != NULL && map->getSurfaceCell(Map::toSurfCoords(targetPos))->getResource() != NULL && map->getSurfaceCell(Map::toSurfCoords(targetPos))->getResource()->getType() != NULL);
 					if(canHarvestDestPos == true) {
 						//if it finds resources it starts harvesting
 						unit->setCurrSkill(hct->getHarvestSkillType());
@@ -679,7 +679,7 @@ void UnitUpdater::updateHarvest(Unit *unit) {
 						if (canHarvestDestPos == true) {
 							unit->setLastHarvestResourceTarget(NULL);
 
-							canHarvestDestPos == (map->getSurfaceCell(Map::toSurfCoords(targetPos)) != NULL && map->getSurfaceCell(Map::toSurfCoords(targetPos))->getResource() != NULL && map->getSurfaceCell(Map::toSurfCoords(targetPos))->getResource()->getType() != NULL);
+							canHarvestDestPos = (map->getSurfaceCell(Map::toSurfCoords(targetPos)) != NULL && map->getSurfaceCell(Map::toSurfCoords(targetPos))->getResource() != NULL && map->getSurfaceCell(Map::toSurfCoords(targetPos))->getResource()->getType() != NULL);
 							if(canHarvestDestPos == true) {
 								//if it finds resources it starts harvesting
 								unit->setCurrSkill(hct->getHarvestSkillType());
diff --git a/source/shared_lib/sources/platform/common/platform_common.cpp b/source/shared_lib/sources/platform/common/platform_common.cpp
index 8c1b2c7b..06085ce9 100644
--- a/source/shared_lib/sources/platform/common/platform_common.cpp
+++ b/source/shared_lib/sources/platform/common/platform_common.cpp
@@ -877,35 +877,35 @@ bool isKeyDown(int virtualKey) {
 	if(key >= 0) {
 		SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] keystate[key] = %d\n",__FILE__,__FUNCTION__,__LINE__,keystate[key]);
 
-		return keystate[key];
+		return (keystate[key] != 0);
 	}
 	switch(key) {
 		case vkAdd:
-			return keystate[SDLK_PLUS] | keystate[SDLK_KP_PLUS];
+			return (keystate[SDLK_PLUS] != 0 || keystate[SDLK_KP_PLUS] != 0);
 		case vkSubtract:
-			return keystate[SDLK_MINUS] | keystate[SDLK_KP_MINUS];
+			return (keystate[SDLK_MINUS] != 0 || keystate[SDLK_KP_MINUS] != 0);
 		case vkAlt:
-			return keystate[SDLK_LALT] | keystate[SDLK_RALT];
+			return (keystate[SDLK_LALT] != 0 || keystate[SDLK_RALT] != 0);
 		case vkControl:
-			return keystate[SDLK_LCTRL] | keystate[SDLK_RCTRL];
+			return (keystate[SDLK_LCTRL] != 0 || keystate[SDLK_RCTRL] != 0);
 		case vkShift:
-			return keystate[SDLK_LSHIFT] | keystate[SDLK_RSHIFT];
+			return (keystate[SDLK_LSHIFT] != 0 || keystate[SDLK_RSHIFT] != 0);
 		case vkEscape:
-			return keystate[SDLK_ESCAPE];
+			return (keystate[SDLK_ESCAPE] != 0);
 		case vkUp:
-			return keystate[SDLK_UP];
+			return (keystate[SDLK_UP] != 0);
 		case vkLeft:
-			return keystate[SDLK_LEFT];
+			return (keystate[SDLK_LEFT] != 0);
 		case vkRight:
-			return keystate[SDLK_RIGHT];
+			return (keystate[SDLK_RIGHT] != 0);
 		case vkDown:
-			return keystate[SDLK_DOWN];
+			return (keystate[SDLK_DOWN] != 0);
 		case vkReturn:
-			return keystate[SDLK_RETURN] | keystate[SDLK_KP_ENTER];
+			return (keystate[SDLK_RETURN] != 0 || keystate[SDLK_KP_ENTER] != 0);
 		case vkBack:
-			return keystate[SDLK_BACKSPACE];
+			return  (keystate[SDLK_BACKSPACE] != 0);
 		case vkDelete:
-			return keystate[SDLK_DELETE];
+			return (keystate[SDLK_DELETE] != 0);
 		default:
 			std::cerr << "isKeyDown called with unknown key.\n";
 			break;