diff --git a/src/r_main.cpp b/src/r_main.cpp
index 4252f4155a..c69c22c7ba 100644
--- a/src/r_main.cpp
+++ b/src/r_main.cpp
@@ -355,7 +355,7 @@ void R_SWRSetWindow(int windowSize, int fullWidth, int fullHeight, int stHeight,
 	MaxVisForWall = (InvZtoScale * (SCREENWIDTH*r_Yaspect) /
 		(viewwidth*SCREENHEIGHT * FocalTangent));
 	MaxVisForWall = 32767.0 / MaxVisForWall;
-	MaxVisForFloor = 32767.0 / (viewheight * FocalLengthY / 160);
+	MaxVisForFloor = 32767.0 / (viewheight >> 2) * FocalLengthY / 160;
 
 	// Reset r_*Visibility vars
 	R_SetVisibility(R_GetVisibility());
diff --git a/src/win32/fb_d3d9.cpp b/src/win32/fb_d3d9.cpp
index 06bfa05691..8bb680dbda 100644
--- a/src/win32/fb_d3d9.cpp
+++ b/src/win32/fb_d3d9.cpp
@@ -1092,6 +1092,7 @@ void D3DFB::Update ()
 			DrawRateStuff();
 			DrawPackedTextures(d3d_showpacks);
 			EndBatch();		// Make sure all batched primitives are drawn.
+			In2D = 0;
 			Flip();
 		}
 		In2D = 0;