diff --git a/Source/control.cpp b/Source/control.cpp
index 5bdd2ea44..46a249eb0 100644
--- a/Source/control.cpp
+++ b/Source/control.cpp
@@ -2634,8 +2634,9 @@ char *control_print_talk_msg(char *msg, int x, int y, int *nOffset, int color)
 	int width;
 
 	x += 264;
+	y += 182 + PANEL_TOP;
 	width = x;
-	*nOffset = PitchTbl[y + 182 + PANEL_TOP] + x;
+	*nOffset = PitchTbl[y] + x;
 	while (*msg) {
 
 		c = fontframe[gbFontTransTbl[(BYTE)*msg]];
diff --git a/Source/dx.cpp b/Source/dx.cpp
index ce9c25d90..54efb059a 100644
--- a/Source/dx.cpp
+++ b/Source/dx.cpp
@@ -44,12 +44,12 @@ static void dx_create_back_buffer()
 	}
 
 	memset(&ddsd, 0, sizeof(ddsd));
-	ddsd.dwWidth = BUFFER_WIDTH;
-	ddsd.lPitch = BUFFER_WIDTH;
 	ddsd.dwSize = sizeof(ddsd);
 	ddsd.dwFlags = DDSD_PIXELFORMAT | DDSD_PITCH | DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS;
 	ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN;
 	ddsd.dwHeight = BUFFER_HEIGHT;
+	ddsd.dwWidth = BUFFER_WIDTH;
+	ddsd.lPitch = BUFFER_WIDTH;
 	ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat);
 	error_code = lpDDSPrimary->GetPixelFormat(&ddsd.ddpfPixelFormat);
 	if (error_code != DD_OK)
diff --git a/Source/gendung.cpp b/Source/gendung.cpp
index 3b0cbfc9e..0233fb299 100644
--- a/Source/gendung.cpp
+++ b/Source/gendung.cpp
@@ -23,7 +23,7 @@ int SpeedFrameTbl[128][16];
 /**
  * List of transparancy masks to use for dPieces
  */
-char block_lvid[2049];
+char block_lvid[MAXTILES + 1];
 int level_frame_count[MAXTILES];
 int tile_defs[MAXTILES];
 WORD level_frame_types[MAXTILES];
@@ -32,20 +32,20 @@ int nlevel_frames;
 /**
  * List of light blocking dPieces
  */
-BOOLEAN nBlockTable[2049];
+BOOLEAN nBlockTable[MAXTILES + 1];
 /**
  * List of path blocking dPieces
  */
-BOOLEAN nSolidTable[2049];
+BOOLEAN nSolidTable[MAXTILES + 1];
 /**
  * List of transparent dPieces
  */
-BOOLEAN nTransTable[2049];
+BOOLEAN nTransTable[MAXTILES + 1];
 /**
  * List of missile blocking dPieces
  */
-BOOLEAN nMissileTable[2049];
-BOOLEAN nTrapTable[2049];
+BOOLEAN nMissileTable[MAXTILES + 1];
+BOOLEAN nTrapTable[MAXTILES + 1];
 int dminx;
 int dminy;
 int dmaxx;
diff --git a/Source/gendung.h b/Source/gendung.h
index 3a34834b2..1cd240605 100644
--- a/Source/gendung.h
+++ b/Source/gendung.h
@@ -21,17 +21,17 @@ extern BYTE *pLevelPieces;
 extern BYTE *pDungeonCels;
 extern BYTE *pSpeedCels;
 extern int SpeedFrameTbl[128][16];
-extern char block_lvid[2049];
+extern char block_lvid[MAXTILES + 1];
 extern int level_frame_count[MAXTILES];
 extern int tile_defs[MAXTILES];
 extern WORD level_frame_types[MAXTILES];
 extern int level_frame_sizes[MAXTILES];
 extern int nlevel_frames;
-extern BOOLEAN nBlockTable[2049];
-extern BOOLEAN nSolidTable[2049];
-extern BOOLEAN nTransTable[2049];
-extern BOOLEAN nMissileTable[2049];
-extern BOOLEAN nTrapTable[2049];
+extern BOOLEAN nBlockTable[MAXTILES + 1];
+extern BOOLEAN nSolidTable[MAXTILES + 1];
+extern BOOLEAN nTransTable[MAXTILES + 1];
+extern BOOLEAN nMissileTable[MAXTILES + 1];
+extern BOOLEAN nTrapTable[MAXTILES + 1];
 extern int dminx;
 extern int dminy;
 extern int dmaxx;