diff --git a/engine/sw/asm_draw.h b/engine/sw/asm_draw.h
index f746187c3..f52e20f88 100644
--- a/engine/sw/asm_draw.h
+++ b/engine/sw/asm_draw.h
@@ -107,7 +107,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // !!! if this is changed, it must be changed in model.h too !!!
 #define me_v				0
 #define me_cachededgeoffset	4
-#define me_size				8
 
 // mvertex_t structure
 // !!! if this is changed, it must be changed in model.h too !!!
diff --git a/engine/sw/d_edge.c b/engine/sw/d_edge.c
index b1d9cc9d5..cb19c00fd 100644
--- a/engine/sw/d_edge.c
+++ b/engine/sw/d_edge.c
@@ -298,6 +298,7 @@ void D_DrawSurfaces (void)
 				}
 				cacheblock = (qbyte *)pface->texinfo->texture + pface->texinfo->texture->offsets[0];
 				cachewidth = 256;
+				cacheheight = 256;
 
 				d_zistepu = s->d_zistepu;
 				d_zistepv = s->d_zistepv;
@@ -309,7 +310,6 @@ void D_DrawSurfaces (void)
 					D_DrawSpans16From8(s->spans);
 				else
 					(*d_drawspans) (s->spans);
-//				D_DrawSolidSurface (s, (int)15);
 
 			// set up a gradient for the background surface that places it
 			// effectively at infinity distance from the viewpoint
diff --git a/engine/sw/r_draw.c b/engine/sw/r_draw.c
index f5d1c42ee..eb2bda3a5 100644
--- a/engine/sw/r_draw.c
+++ b/engine/sw/r_draw.c
@@ -243,14 +243,14 @@ void R_InitSkyBox (void)
 
 	for (i=0 ; i<24 ; i++)
 		if (box_surfedges[i] > 0)
-			r_skysurfedges[i] = wm->numedges-12 + box_surfedges[i];
+			r_skysurfedges[i] = wm->numedges - 1 + box_surfedges[i];
 		else
-			r_skysurfedges[i] = - (wm->numedges-12 + -box_surfedges[i]);
+			r_skysurfedges[i] = -(wm->numedges - 1 + -box_surfedges[i]);
 
 	for(i=0 ; i<12 ; i++)
 	{
-		r_skyedges[i].v[0] = wm->numvertexes-8+box_edges[i*2+0];
-		r_skyedges[i].v[1] = wm->numvertexes-8+box_edges[i*2+1];
+		r_skyedges[i].v[0] = wm->numvertexes-1+box_edges[i*2+0];
+		r_skyedges[i].v[1] = wm->numvertexes-1+box_edges[i*2+1];
 		r_skyedges[i].cachededgeoffset = 0;
 	}