diff --git a/Source/gendung.cpp b/Source/gendung.cpp
index b4e251190..04d1bb1ea 100644
--- a/Source/gendung.cpp
+++ b/Source/gendung.cpp
@@ -105,7 +105,7 @@ void FillSolidBlockTbls()
 	for (i = 1; i <= dwTiles; i++) {
 		bv = *pTmp++;
 		if (bv & 1)
-			nSolidTable[i] = 1;
+			nSolidTable[i] = TRUE;
 		if (bv & 2)
 			nBlockTable[i] = TRUE;
 		if (bv & 4)
@@ -113,7 +113,7 @@ void FillSolidBlockTbls()
 		if (bv & 8)
 			nTransTable[i] = TRUE;
 		if (bv & 0x80)
-			nTrapTable[i] = 1;
+			nTrapTable[i] = TRUE;
 		block_lvid[i] = (bv & 0x70) >> 4; /* beta: (bv >> 4) & 7 */
 	}
 
diff --git a/Source/monster.cpp b/Source/monster.cpp
index fcce5c0f4..a604c4141 100644
--- a/Source/monster.cpp
+++ b/Source/monster.cpp
@@ -4730,7 +4730,7 @@ BOOL PosOkMissile(int x, int y)
 
 BOOL CheckNoSolid(int x, int y)
 {
-	return nSolidTable[dPiece[x][y]] == 0;
+	return nSolidTable[dPiece[x][y]] == FALSE;
 }
 
 BOOL LineClearF(BOOL (*Clear)(int, int), int x1, int y1, int x2, int y2)
diff --git a/Source/objects.cpp b/Source/objects.cpp
index 40c4f2a04..37a44e1d9 100644
--- a/Source/objects.cpp
+++ b/Source/objects.cpp
@@ -1105,10 +1105,10 @@ void AddBarrel(int i, int t)
 
 void AddShrine(int i)
 {
-	int val, j, slist[26];
+	int val, j, slist[NUM_SHRINETYPE];
 
 	object[i]._oPreFlag = TRUE;
-	for (j = 0; j < 26; j++) {
+	for (j = 0; j < NUM_SHRINETYPE; j++) {
 		if (currlevel < shrinemin[j] || currlevel > shrinemax[j]) {
 			slist[j] = 0;
 		} else {
@@ -1125,7 +1125,7 @@ void AddShrine(int i)
 		}
 	}
 	while (1) {
-		val = random(150, 26);
+		val = random(150, NUM_SHRINETYPE);
 		if (slist[val]) {
 			break;
 		}