diff --git a/Strategic/Map Screen Helicopter.cpp b/Strategic/Map Screen Helicopter.cpp
index 9944f1db..3315137c 100644
--- a/Strategic/Map Screen Helicopter.cpp	
+++ b/Strategic/Map Screen Helicopter.cpp	
@@ -417,7 +417,7 @@ helisiteEndElementHandle(void *userData, const XML_Char *name)
 			pData->curElement = HELISITE_ELEMENT_REFUEL;
 
 			pData->curHeliInfo.refuelHeliGridNo = atol(pData->szCharData);
-			if ( pData->curHeliInfo.refuelHeliGridNo >= WORLD_MAX )
+			if ( pData->curHeliInfo.refuelHeliGridNo >= MAX_ALLOWED_WORLD_MAX )
 			{
 				pData->curHeliInfo.refuelHeliGridNo = 0;
 			}
@@ -427,7 +427,7 @@ helisiteEndElementHandle(void *userData, const XML_Char *name)
 			pData->curElement = HELISITE_ELEMENT_REFUEL;
 
 			pData->curHeliInfo.refuelSkyriderGridNo = atol(pData->szCharData);
-			if ( pData->curHeliInfo.refuelSkyriderGridNo >= WORLD_MAX )
+			if ( pData->curHeliInfo.refuelSkyriderGridNo >= MAX_ALLOWED_WORLD_MAX )
 			{
 				pData->curHeliInfo.refuelSkyriderGridNo = 0;
 			}
diff --git a/Strategic/strategicmap.cpp b/Strategic/strategicmap.cpp
index 1eeafa33..d934893b 100644
--- a/Strategic/strategicmap.cpp
+++ b/Strategic/strategicmap.cpp
@@ -681,7 +681,7 @@ samsiteEndElementHandle(void *userData, const XML_Char *name)
 			pData->curElement = SAMSITE_ELEMENT_SAM;
 
 			pData->curSamInfo.samGridNoA = atol(pData->szCharData);
-			if ( pData->curSamInfo.samGridNoA >= WORLD_MAX )
+			if ( pData->curSamInfo.samGridNoA >= MAX_ALLOWED_WORLD_MAX )
 			{
 				pData->curSamInfo.samGridNoA = 0;
 			}
@@ -691,7 +691,7 @@ samsiteEndElementHandle(void *userData, const XML_Char *name)
 			pData->curElement = SAMSITE_ELEMENT_SAM;
 
 			pData->curSamInfo.samGridNoB = atol(pData->szCharData);
-			if ( pData->curSamInfo.samGridNoB >= WORLD_MAX )
+			if ( pData->curSamInfo.samGridNoB >= MAX_ALLOWED_WORLD_MAX )
 			{
 				pData->curSamInfo.samGridNoB = 1;
 			}
@@ -3416,7 +3416,6 @@ void GetSectorIDString( INT16 sSectorX, INT16 sSectorY, INT8 bSectorZ , STR16 zS
 	INT8		bTownNameID;
 	UINT8 ubSectorID = 0;
 	UINT8 ubLandType = 0;
-	UINT8 ubMineIndex;
 
 	if( sSectorX <= 0 || sSectorY <= 0 || bSectorZ < 0 )
 	{
@@ -3721,7 +3720,7 @@ void GetSectorIDString( INT16 sSectorX, INT16 sSectorY, INT8 bSectorZ , STR16 zS
 							if( fDetailed )
 							{
 								/*
-								ubMineIndex = GetMineIndexForSector( sSectorX, sSectorY );
+								UINT8 ubMineIndex = GetMineIndexForSector( sSectorX, sSectorY );
 								if ( gMineStatus[ubMineIndex].sSectorX == sSectorX && gMineStatus[ubMineIndex].sSectorY == sSectorY )
 								{
 									swprintf( zString, L" %s", MineralsName[gMineStatus[ubMineIndex].ubMineType].sType );