diff --git a/src/vid_et4000w32.c b/src/vid_et4000w32.c
index 943681144..588973e33 100644
--- a/src/vid_et4000w32.c
+++ b/src/vid_et4000w32.c
@@ -286,8 +286,10 @@ uint8_t et4000w32p_in(uint16_t addr, void *p)
                 return et4000->index;
                 case 0x210B: case 0x211B: case 0x212B: case 0x213B:
                 case 0x214B: case 0x215B: case 0x216B: case 0x217B:
+/*                if (et4000->index==0xec) 
+                        return (et4000->regs[0xec] & 0xf) | 0x60; /*ET4000/W32p rev D*/ */
                 if (et4000->index==0xec) 
-                        return (et4000->regs[0xec] & 0xf) | 0x60; /*ET4000/W32p rev D*/
+                        return (et4000->regs[0xec] & 0xf) | (et4000->revision << 4); /*ET4000/W32p rev D*/
                 if (et4000->index == 0xef) 
                 {
                         if (PCI) return et4000->regs[0xef] | 0xe0;       /*PCI*/
@@ -1146,7 +1148,8 @@ uint8_t et4000w32p_pci_read(int func, int addr, void *p)
                 case 0x00: return 0x0c; /*Tseng Labs*/
                 case 0x01: return 0x10;
                 
-                case 0x02: return 0x06; /*ET4000W32p Rev D*/
+                // case 0x02: return 0x06; /*ET4000W32p Rev D*/
+		case 0x02: return et4000->revision;
                 case 0x03: return 0x32;
                 
                 case PCI_REG_COMMAND:
diff --git a/src/video.c b/src/video.c
index a9a340928..8b3d99ca7 100644
--- a/src/video.c
+++ b/src/video.c
@@ -589,21 +589,21 @@ void take_screenshot()
 #else
 time_t now;
 struct tm *info;
-char screenshot_fn_partial[1024];
-char screenshot_fn[2048];
+char screenshot_fn_partial[2048];
+char screenshot_fn[4096];
 
 void take_screenshot()
 {
 	if ((vid_api < 0) || (vid_api > 1))  return;
 	time(&now);
 	info = localtime(&now);
-	memset(screenshot_fn, 0, 1024);
+	memset(screenshot_fn, 0, 4096);
 	memset(screenshot_fn_partial, 0, 2048);
 	pclog("Video API is: %i\n", vid_api);
 	if (vid_api == 1)
 	{
-		strftime(screenshot_fn_partial, 1024, "screenshots\\%Y%m%d_%H%M%S.png", info);
-		append_filename(screenshot_fn, pcempath, screenshot_fn_partial, 2047);
+		strftime(screenshot_fn_partial, 2048, "screenshots\\%Y%m%d_%H%M%S.png", info);
+		append_filename(screenshot_fn, pcempath, screenshot_fn_partial, 4095);
 		if (video_fullscreen)
 		{
 			d3d_fs_take_screenshot(screenshot_fn);
@@ -617,7 +617,7 @@ void take_screenshot()
 	else if (vid_api == 0)
 	{
 		strftime(screenshot_fn_partial, 1024, "screenshots\\%Y%m%d_%H%M%S.bmp", info);
-		append_filename(screenshot_fn, pcempath, screenshot_fn_partial, 2047);
+		append_filename(screenshot_fn, pcempath, screenshot_fn_partial, 4095);
 		if (video_fullscreen)
 		{
 			ddraw_fs_take_screenshot(screenshot_fn);