diff --git a/engine/client/pr_menu.c b/engine/client/pr_menu.c
index 3213e2c94..dcbb0f85b 100644
--- a/engine/client/pr_menu.c
+++ b/engine/client/pr_menu.c
@@ -468,6 +468,8 @@ void PF_CL_drawline (progfuncs_t *prinst, struct globalvars_s *pr_globals)
 	float *pos = G_VECTOR(OFS_PARM4);
 	int numpoints = *prinst->callargc-4;
 
+#ifdef RGLQUAKE	// :(
+
 	if (qrenderer == QR_OPENGL)
 	{
 		qglColor4f(rgb[0], rgb[1], rgb[2], alpha);
@@ -480,6 +482,7 @@ void PF_CL_drawline (progfuncs_t *prinst, struct globalvars_s *pr_globals)
 
 		qglEnd();
 	}
+#endif
 }
 
 //vector  drawgetimagesize(string pic) = #460;
diff --git a/engine/client/r_part.c b/engine/client/r_part.c
index 119fa954e..e12f73ebe 100644
--- a/engine/client/r_part.c
+++ b/engine/client/r_part.c
@@ -3926,6 +3926,7 @@ void DrawParticleTypes (void texturedparticles(particle_t *,part_type_t*), void
 	particletime += pframetime;
 }
 
+#ifdef RGLQUAKE
 void P_FlushRenderer(void)
 {
 	qglDepthMask(0);	//primarily to stop close particles from obscuring each other
@@ -3935,6 +3936,7 @@ void P_FlushRenderer(void)
 	qglBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 	lasttype = NULL;
 }
+#endif
 
 /*
 ===============
diff --git a/engine/gl/gl_model.h b/engine/gl/gl_model.h
index b5aa2230e..10c8fc647 100644
--- a/engine/gl/gl_model.h
+++ b/engine/gl/gl_model.h
@@ -370,6 +370,10 @@ typedef struct hull_s
 
 
 void Q1BSP_SetHullFuncs(hull_t *hull);
+qboolean Q1BSP_Trace(struct model_s *model, int forcehullnum, int frame, vec3_t start, vec3_t end, vec3_t mins, vec3_t maxs, struct trace_s *trace);
+void Q1BSP_FatPVS (vec3_t org, qboolean add);
+qboolean Q1BSP_EdictInFatPVS(struct edict_s *ent);
+void Q1BSP_FindTouchedLeafs(struct edict_s *ent);
 
 /*
 ==============================================================================
diff --git a/engine/server/pr_cmds.c b/engine/server/pr_cmds.c
index a24a139a2..53504617c 100644
--- a/engine/server/pr_cmds.c
+++ b/engine/server/pr_cmds.c
@@ -3715,7 +3715,6 @@ void PF_droptofloor (progfuncs_t *prinst, struct globalvars_s *pr_globals)
 	end[2] -= 512;
 
 	VectorCopy (ent->v->origin, start);
-	start[2] += 1;
 	trace = SV_Move (start, ent->v->mins, ent->v->maxs, end, MOVE_NORMAL, ent);
 
 	if (trace.fraction == 1 || trace.allsolid)
diff --git a/engine/server/svmodel.c b/engine/server/svmodel.c
index fb79f8d7f..c9a675d43 100644
--- a/engine/server/svmodel.c
+++ b/engine/server/svmodel.c
@@ -1220,10 +1220,6 @@ void Mod_LoadPlanes (lump_t *l)
 	}
 }
 
-void Q1BSP_FatPVS (vec3_t org, qboolean add);
-qboolean Q1BSP_EdictInFatPVS(struct edict_s *ent);
-void Q1BSP_FindTouchedLeafs(struct edict_s *ent);
-
 /*
 =================
 Mod_LoadBrushModel
@@ -1300,6 +1296,7 @@ void Mod_LoadBrushModel (model_t *mod, void *buffer)
 
 	mod->funcs.LeafForPoint			= Mod_LeafForPoint;
 	mod->funcs.LeafPVS				= Mod_LeafnumPVS;
+	mod->funcs.Trace				= Q1BSP_Trace;
 
 
 	mod->numframes = 2;		// regular and alternate animation
diff --git a/engine/server/world.c b/engine/server/world.c
index f952fe422..84cdb4bc1 100644
--- a/engine/server/world.c
+++ b/engine/server/world.c
@@ -1732,7 +1732,7 @@ trace_t SV_Move (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, int type, e
 	clip.end = end;
 	clip.mins = mins;
 	clip.maxs = maxs;
-	clip.type = type|4;
+	clip.type = type;
 	clip.passedict = passedict;
 	clip.hullnum = hullnum;
 #ifdef Q2SERVER
diff --git a/engine/sw/sw_model.c b/engine/sw/sw_model.c
index 112aec975..170e0849f 100644
--- a/engine/sw/sw_model.c
+++ b/engine/sw/sw_model.c
@@ -1972,6 +1972,7 @@ void SWMod_LoadBrushModel (model_t *mod, void *buffer)
 
 	mod->funcs.LeafForPoint			= SWMod_LeafForPoint;
 	mod->funcs.LeafPVS				= SWMod_LeafnumPVS;
+	mod->funcs.Trace				= Q1BSP_Trace;
 
 //We ONLY do this for the world model
 #ifndef SERVERONLY