diff --git a/engine/Makefile b/engine/Makefile
index ed25105d2..1d610acdf 100644
--- a/engine/Makefile
+++ b/engine/Makefile
@@ -574,7 +574,6 @@ GLQUAKE_OBJS =		\
 D3DQUAKE_OBJS =		\
 	d3d8_backend.o \
 	d3d8_image.o	\
-	d3d8_shader.o	\
 	vid_d3d8.o	\
 	d3d_backend.o \
 	d3d_image.o	\
diff --git a/engine/client/m_download.c b/engine/client/m_download.c
index 0ebdf3770..0fa0c9f2e 100644
--- a/engine/client/m_download.c
+++ b/engine/client/m_download.c
@@ -2596,7 +2596,7 @@ void PM_Command_f(void)
 		unsigned int changes = PM_MarkUpdates();
 		if (changes)
 		{
-			Con_Printf("%u packages flagged\n");
+			Con_Printf("%u packages flagged\n", changes);
 			PM_PromptApplyChanges();
 		}
 		else
diff --git a/engine/client/pr_menu.c b/engine/client/pr_menu.c
index 9e1bb60b7..df8e8724f 100644
--- a/engine/client/pr_menu.c
+++ b/engine/client/pr_menu.c
@@ -853,31 +853,6 @@ void QCBUILTIN PF_CL_drawline (pubprogfuncs_t *prinst, struct globalvars_s *pr_g
 	int flags	= prinst->callargc >= 6?G_FLOAT(OFS_PARM5):0;
 	shader_t *shader_draw_line;
 
-	mesh_t mesh;
-	vecV_t vpos[2];
-	vec2_t vst[2];
-	vec4_t vcol[2];
-	index_t idx[2];
-
-	memset(&mesh, 0, sizeof(mesh));
-	mesh.indexes = idx;
-	mesh.xyz_array = vpos;
-	mesh.st_array = vst;
-	mesh.colors4f_array[0] = vcol;
-
-	VectorCopy(point1, vpos[0]);
-	Vector2Set(vst[0], 0, 0);
-	Vector4Set(vcol[0], rgb[0], rgb[1], rgb[2], alpha);
-
-	VectorCopy(point2, vpos[1]);
-	Vector2Set(vst[1], 0, 0);
-	Vector4Set(vcol[1], rgb[0], rgb[1], rgb[2], alpha);
-	mesh.numvertexes = 2;
-
-	mesh.indexes[0] = 0;
-	mesh.indexes[1] = 1;
-	mesh.numindexes = 2;
-
 	//this shader lookup might get pricy.
 	shader_draw_line = R_RegisterShader("shader_draw_line", SUF_NONE,
 		"{\n"
@@ -890,11 +865,11 @@ void QCBUILTIN PF_CL_drawline (pubprogfuncs_t *prinst, struct globalvars_s *pr_g
 			"}\n"
 		"}\n");
 
+	r2d_be_flags = PF_SelectDPDrawFlag(flags);
 	R2D_ImageColours(rgb[0], rgb[1], rgb[2], alpha);
 	R2D_Line(point1[0], point1[1], point2[0], point2[1], shader_draw_line);
 	R2D_ImageColours(1,1,1,1);
-
-//	BE_DrawMesh_Single(shader_draw_line, &mesh, NULL, flags|BEF_LINES);
+	r2d_be_flags = 0;
 }
 
 //vector  drawgetimagesize(string pic) = #460;
diff --git a/engine/d3d/vid_d3d8.c b/engine/d3d/vid_d3d8.c
index 86dbafb54..cd5ee188d 100644
--- a/engine/d3d/vid_d3d8.c
+++ b/engine/d3d/vid_d3d8.c
@@ -15,6 +15,9 @@
 #endif
 
 #include    <d3d8.h>
+#ifndef D3DSGR_NO_CALIBRATION
+#define D3DSGR_NO_CALIBRATION 0	//mingw fails to define this.
+#endif
 
 /*Fixup outdated windows headers*/
 #ifndef WM_XBUTTONDOWN
diff --git a/engine/server/sv_mvd.c b/engine/server/sv_mvd.c
index dc2b71e85..2d5210216 100644
--- a/engine/server/sv_mvd.c
+++ b/engine/server/sv_mvd.c
@@ -2515,7 +2515,7 @@ void SV_UserCmdMVDList_f (void)
 		}
 
 		if (host_client->num_backbuf == MAX_BACK_BUFFERS)
-			SV_ClientPrintf(host_client, PRINT_HIGH, "*MORE*\n", i, list->name, list->size/1024);
+			SV_ClientPrintf(host_client, PRINT_HIGH, "*MORE*\n");
 	}
 
 	for (d = demo.dest; d; d = d->nextdest)
diff --git a/engine/server/sv_user.c b/engine/server/sv_user.c
index 525c06cfc..d7f42d420 100644
--- a/engine/server/sv_user.c
+++ b/engine/server/sv_user.c
@@ -4132,7 +4132,6 @@ Allow clients to change userinfo
 */
 void SV_SetInfo_f (void)
 {
-	int i;
 	char oldval[MAX_INFO_KEY];
 	char *key, *val;
 
@@ -4193,7 +4192,6 @@ void SV_SetInfo_f (void)
 
 	if (*key != '_')
 	{
-		i = host_client - svs.clients;
 		val = Info_ValueForKey(host_client->userinfo, key);
 
 		SV_BroadcastUserinfoChange(host_client, SV_UserInfoIsBasic(key), key, val);