diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 69c3d47d3..151820990 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,3 +1,11 @@
+April 22, 2007 (Changes by Graf Zahl)
+- Fixed: ShowErrorPane deleted the StartScreen instead of just calling
+  NetDone.
+- moved the DIM_MAP define into v_palette.h so that it can be accessed
+  from outside the status bar code.
+- Fixed: The check for non-swimmable water in UpdateWaterLevel checked for
+  SECF_UNDERWATER instead of SECF_UNDERWATERMASK.
+  
 April 12, 2007
 - Switched ACS world and global arrays to the TMap class instead of
   TAutoGrowArray. A map can handle a wide range of key values better than
diff --git a/src/g_doom/doom_sbar.cpp b/src/g_doom/doom_sbar.cpp
index 81c138551..4912df5a5 100644
--- a/src/g_doom/doom_sbar.cpp
+++ b/src/g_doom/doom_sbar.cpp
@@ -14,8 +14,6 @@
 #include "templates.h"
 #include "i_system.h"
 
-// The translation to use for depleted items
-#define DIM_MAP &NormalLight.Maps[NUMCOLORMAPS*2/3*256]
 
 #define ST_EVILGRINCOUNT		(2*TICRATE)
 #define ST_STRAIGHTFACECOUNT	(TICRATE/2)
diff --git a/src/g_heretic/heretic_sbar.cpp b/src/g_heretic/heretic_sbar.cpp
index 6e2bbd1b8..887376fa6 100644
--- a/src/g_heretic/heretic_sbar.cpp
+++ b/src/g_heretic/heretic_sbar.cpp
@@ -14,8 +14,6 @@
 #include "templates.h"
 #include "a_keys.h"
 
-// The translation to use for depleted items
-#define DIM_MAP &NormalLight.Maps[NUMCOLORMAPS*2/3*256]
 
 static FRandom pr_chainwiggle;
 
diff --git a/src/g_hexen/hexen_sbar.cpp b/src/g_hexen/hexen_sbar.cpp
index 28d1755e8..5767fc99d 100644
--- a/src/g_hexen/hexen_sbar.cpp
+++ b/src/g_hexen/hexen_sbar.cpp
@@ -15,8 +15,6 @@
 #include "a_hexenglobal.h"
 #include "a_keys.h"
 
-// The translation to use for depleted items
-#define DIM_MAP &NormalLight.Maps[NUMCOLORMAPS*2/3*256]
 
 class FManaBar : public FTexture
 {
diff --git a/src/g_strife/strife_sbar.cpp b/src/g_strife/strife_sbar.cpp
index 89385bedf..06ac61582 100644
--- a/src/g_strife/strife_sbar.cpp
+++ b/src/g_strife/strife_sbar.cpp
@@ -15,9 +15,6 @@
 #include "a_strifeglobal.h"
 #include "gi.h"
 
-// The translation to use for depleted items
-#define DIM_MAP &NormalLight.Maps[NUMCOLORMAPS*2/3*256]
-
 // Number of tics to move the popscreen up and down.
 #define POP_TIME (TICRATE/8)
 
diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp
index 6c97683c2..b67389c8f 100644
--- a/src/p_mobj.cpp
+++ b/src/p_mobj.cpp
@@ -3000,7 +3000,7 @@ bool AActor::UpdateWaterLevel (fixed_t oldz, bool dosplash)
 			}
 			// even non-swimmable deep water must be checked here to do the splashes correctly
 			// But the water level must be reset when this function returns!
-			if (!(hsec->MoreFlags&SECF_UNDERWATER)) reset=true;
+			if (!(hsec->MoreFlags&SECF_UNDERWATERMASK)) reset=true;
 		}
 	}
 
diff --git a/src/v_palette.h b/src/v_palette.h
index 93d3e9eae..dee420b60 100644
--- a/src/v_palette.h
+++ b/src/v_palette.h
@@ -88,6 +88,10 @@ extern FPalette GPalette;
 extern "C" {
 extern FDynamicColormap NormalLight;
 }
+
+// The translation to use for depleted items
+#define DIM_MAP &NormalLight.Maps[NUMCOLORMAPS*2/3*256]
+
 extern int Near255;		// A color near 255 in appearance, but not 255
 
 int BestColor (const uint32 *pal, int r, int g, int b, int first=1, int num=255);
diff --git a/src/win32/i_main.cpp b/src/win32/i_main.cpp
index ce5b97592..60de2bbd0 100644
--- a/src/win32/i_main.cpp
+++ b/src/win32/i_main.cpp
@@ -681,8 +681,7 @@ void ShowErrorPane(const char *text)
 	SetWindowText (Window, "Fatal Error - " WINDOW_TITLE);
 	if (StartScreen != NULL)	// Ensure that the network pane is hidden.
 	{
-		delete StartScreen;
-		StartScreen = NULL;
+		StartScreen->NetDone();
 	}
 	ErrorIcon = CreateWindowEx (WS_EX_NOPARENTNOTIFY, "STATIC", NULL, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | SS_OWNERDRAW, 0, 0, 0, 0, Window, NULL, g_hInst, NULL);
 	if (ErrorIcon != NULL)