diff --git a/src/win32/hardware.cpp b/src/win32/hardware.cpp
index d97a94dac..0fb64c008 100644
--- a/src/win32/hardware.cpp
+++ b/src/win32/hardware.cpp
@@ -99,7 +99,7 @@ CUSTOM_CVAR(Int, vid_gpuswitch, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINI
 }
 
 // Software OpenGL canvas
-CUSTOM_CVAR(Bool, vid_used3d, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
+CUSTOM_CVAR(Bool, vid_glswfb, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
 {
 	if ((self ? 1 : 0) != currentcanvas)
 		Printf("You must restart " GAMENAME " for this change to take effect.\n");
@@ -177,7 +177,7 @@ void I_InitGraphics ()
 	val.Bool = !!Args->CheckParm ("-devparm");
 	ticker.SetGenericRepDefault (val, CVAR_Bool);
 
-	if (currentcanvas == 1) // Software Canvas: 1 = D3D or DirectDraw, 0 = OpenGL
+	if (currentcanvas == 0) // Software Canvas: 0 = D3D or DirectDraw, 1 = OpenGL
 		if (currentrenderer == 1)
 			Video = gl_CreateVideo();
 		else
@@ -201,14 +201,14 @@ static void I_DeleteRenderer()
 void I_CreateRenderer()
 {
 	currentrenderer = vid_renderer;
-	currentcanvas = vid_used3d;
+	currentcanvas = vid_glswfb;
 	if (currentrenderer == 1)
 		Printf("Renderer: OpenGL\n");
-	else if (currentcanvas == 0)
-		Printf("Renderer: Software on OpenGL\n");
-	else if (currentcanvas == 1 && vid_forceddraw == false)
-		Printf("Renderer: Software on Direct3D\n");
 	else if (currentcanvas == 1)
+		Printf("Renderer: Software on OpenGL\n");
+	else if (currentcanvas == 0 && vid_forceddraw == false)
+		Printf("Renderer: Software on Direct3D\n");
+	else if (currentcanvas == 0)
 		Printf("Renderer: Software on DirectDraw\n");
 	else
 		Printf("Renderer: Unknown\n");
diff --git a/wadsrc/static/compatibility.txt b/wadsrc/static/compatibility.txt
index 4c9576e18..621c4920e 100644
--- a/wadsrc/static/compatibility.txt
+++ b/wadsrc/static/compatibility.txt
@@ -488,6 +488,12 @@ F6EE16F770AD309D608EA0B1F1E249FC // Ultimate Doom, e4m3
 {
 	setsectorspecial 147 0
 }
+0D491365C1B88B7D1B603890100DD03E // doom2.wad map18
+{
+	// missing textures
+	setwalltexture 451 front mid metal
+	setwalltexture 459 front mid metal
+}
 EBDAC00E9D25D884B2C8F4B1F0390539 // doom2.wad map21
 {
 	// push ceiling down in glitchy sectors above the stair switches
diff --git a/wadsrc/static/language.enu b/wadsrc/static/language.enu
index 7b52d019b..41a804ed2 100644
--- a/wadsrc/static/language.enu
+++ b/wadsrc/static/language.enu
@@ -2361,6 +2361,8 @@ OPTVAL_EVERYTHING			= "Everything";
 OPTVAL_FULLSCREENONLY		= "Fullscreen only";
 OPTVAL_GL 					= "OpenGL";
 OPTVAL_D3D					= "Direct3D";
+OPTVAL_SDL					= "SDL";
+OPTVAL_COCOA				= "Cocoa";
 OPTVAL_HWPOLY				= "OpenGL-Accelerated";
 OPTVAL_SWDOOM				= "Doom Software Renderer";
 OPTVAL_DEDICATED			= "High-Performance";
diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt
index fe7743148..bb7c03b7a 100644
--- a/wadsrc/static/menudef.txt
+++ b/wadsrc/static/menudef.txt
@@ -1771,6 +1771,18 @@ OptionValue "GLD3D"
 	1, "$OPTVAL_GL"
 }
 
+OptionValue "GLSDL"
+{
+	0, "$OPTVAL_SDL"
+	1, "$OPTVAL_GL"
+}
+
+OptionValue "GLCOCOA"
+{
+	0, "$OPTVAL_COCOA"
+	1, "$OPTVAL_GL"
+}
+
 OptionMenu RendererMenu
 {
 	Title "$RNDMNU_TITLE"
@@ -1779,7 +1791,15 @@ OptionMenu RendererMenu
 	Option "$RNDMNU_POLY",		"r_polyrenderer", "OnOff"
 	IfOption(Windows)
 	{
-		Option "$RNDMNU_CANVAS",	"vid_used3d", "D3DGL"
+		Option "$RNDMNU_CANVAS",	"vid_glswfb", "GLD3D"
+	}
+	IfOption(unix)
+	{
+		Option "$RNDMNU_CANVAS",	"vid_glswfb", "GLSDL"
+	}
+	IfOption(Mac)
+	{
+		Option "$RNDMNU_CANVAS",	"vid_glswfb", "GLCOCOA"
 	}
 }