diff --git a/Source/control.cpp b/Source/control.cpp
index 60f6db97d..5a196e927 100644
--- a/Source/control.cpp
+++ b/Source/control.cpp
@@ -1819,7 +1819,7 @@ void DrawChr()
 		ADD_PlrStringXY(168, 32, 299, "Warrior", COL_WHITE);
 #ifndef SPAWN
 	} else if (plr[myplr]._pClass == PC_ROGUE) {
-		ADD_PlrStringXY(168, 32, 299, "Rogue", COL_WHITE); /* should use ClassStrTbl ? */
+		ADD_PlrStringXY(168, 32, 299, "Rogue", COL_WHITE);
 	} else if (plr[myplr]._pClass == PC_SORCERER) {
 		ADD_PlrStringXY(168, 32, 299, "Sorceror", COL_WHITE);
 #endif
@@ -1893,7 +1893,7 @@ void DrawChr()
 		MY_PlrStringXY(258, 239, 301, chrstr, col, 0);
 
 	col = plr[myplr]._pMagResist == 0 ? COL_WHITE : COL_BLUE;
-	if (plr[myplr]._pMagResist < 75) {
+	if (plr[myplr]._pMagResist < MAXRESIST) {
 		sprintf(chrstr, "%i%%", plr[myplr]._pMagResist);
 	} else {
 		col = COL_GOLD;
@@ -1902,7 +1902,7 @@ void DrawChr()
 	ADD_PlrStringXY(257, 276, 300, chrstr, col);
 
 	col = plr[myplr]._pFireResist == 0 ? COL_WHITE : COL_BLUE;
-	if (plr[myplr]._pFireResist < 75) {
+	if (plr[myplr]._pFireResist < MAXRESIST) {
 		sprintf(chrstr, "%i%%", plr[myplr]._pFireResist);
 	} else {
 		col = COL_GOLD;
@@ -1911,7 +1911,7 @@ void DrawChr()
 	ADD_PlrStringXY(257, 304, 300, chrstr, col);
 
 	col = plr[myplr]._pLghtResist == 0 ? COL_WHITE : COL_BLUE;
-	if (plr[myplr]._pLghtResist < 75) {
+	if (plr[myplr]._pLghtResist < MAXRESIST) {
 		sprintf(chrstr, "%i%%", plr[myplr]._pLghtResist);
 	} else {
 		col = COL_GOLD;
@@ -2186,7 +2186,7 @@ void DrawDurIcon()
 	int x1, x2, x3, x4;
 
 	if (!chrflag && !questlog || !invflag && !sbookflag) {
-		x1 = 592 + PANEL_X;
+		x1 = 272 + RIGHT_PANEL_X;
 		if (invflag || sbookflag)
 			x1 = 272 + PANEL_X;
 		p = &plr[myplr];
diff --git a/Source/debug.cpp b/Source/debug.cpp
index 207589d08..243a763f1 100644
--- a/Source/debug.cpp
+++ b/Source/debug.cpp
@@ -9,9 +9,10 @@
 BOOL update_seed_check = FALSE;
 #endif
 
+#define DEBUGSEEDS 4096
 int seed_index;
-int level_seeds[NUMLEVELS];
-int seed_table[4096];
+int level_seeds[NUMLEVELS + 1];
+int seed_table[DEBUGSEEDS];
 
 BYTE *pSquareCel;
 char dMonsDbg[NUMLEVELS][MAXDUNX][MAXDUNY];
@@ -33,7 +34,7 @@ void init_seed_desync()
 {
 	int i;
 
-	for (i = 0; i < 4096; i++) {
+	for (i = 0; i < DEBUGSEEDS; i++) {
 		seed_table[i] = -1;
 	}
 
@@ -66,7 +67,7 @@ void seed_desync_index_set()
 
 void seed_desync_check(int seed)
 {
-	if (!update_seed_check || seed_index == 4096 || currlevel == 0) {
+	if (!update_seed_check || seed_index == DEBUGSEEDS || currlevel == 0) {
 		return;
 	}
 
diff --git a/Source/missiles.cpp b/Source/missiles.cpp
index 410ca94c6..649ae6b9e 100644
--- a/Source/missiles.cpp
+++ b/Source/missiles.cpp
@@ -2359,7 +2359,7 @@ void AddResurrectBeam(int mi, int sx, int sy, int dx, int dy, int midir, char mi
 	missile[mi]._misy = missile[mi]._miy;
 	missile[mi]._mixvel = 0;
 	missile[mi]._miyvel = 0;
-	missile[mi]._mirange = misfiledata[36].mAnimLen[0];
+	missile[mi]._mirange = misfiledata[MFILE_RESSUR1].mAnimLen[0];
 }
 
 void AddTelekinesis(int mi, int sx, int sy, int dx, int dy, int midir, char mienemy, int id, int dam)
diff --git a/defs.h b/defs.h
index 505eb4bf8..9385c921b 100644
--- a/defs.h
+++ b/defs.h
@@ -63,6 +63,7 @@
 
 // from diablo 2 beta
 #define MAXEXP					2000000000
+#define MAXRESIST				75
 
 #define GOLD_SMALL_LIMIT		1000
 #define GOLD_MEDIUM_LIMIT		2500