diff --git a/engine/Makefile b/engine/Makefile
index 717f2bae5..1da8e1ba0 100644
--- a/engine/Makefile
+++ b/engine/Makefile
@@ -243,7 +243,7 @@ ifeq ($(FTE_TARGET),vc)
 	WARNINGFLAGS=-W3 -D_CRT_SECURE_NO_WARNINGS
 	GNUC_FUNCS=
 else
-	WARNINGFLAGS=-Wall -Wno-pointer-sign
+	WARNINGFLAGS=-Wall
 
 	GNUC_FUNCS= -Dstrnicmp=strncasecmp -Dstricmp=strcasecmp -D_vsnprintf=vsnprintf -D_snprintf=snprintf
 endif
@@ -411,7 +411,6 @@ SERVER_OBJS = 		\
 	sv_nchan.o 		\
 	sv_ents.o 		\
 	sv_send.o 		\
-	sv_move.o 		\
 	sv_phys.o 		\
 	sv_user.o		\
 	sv_mvd.o		\
@@ -468,6 +467,7 @@ COMMON_OBJS = $(COMMON_ASM_OBJS) \
 	glmod_doom.o 	\
 	q3common.o	\
 	world.o 		\
+	sv_move.o 		\
 	pmove.o		\
 	pmovetst.o		\
 	iwebiface.o		\
diff --git a/engine/client/m_options.c b/engine/client/m_options.c
index 2879e5078..d709e2bff 100644
--- a/engine/client/m_options.c
+++ b/engine/client/m_options.c
@@ -1838,7 +1838,7 @@ void M_Menu_Singleplayer_Cheats_Quake2_f (void)
 
 	singleplayerq2info_t *info;
 	int cursorpositionY;
-	#ifndef MINIMAL
+	#ifndef CLIENTONLY
 	int currentskill;
 	int currentmap;
 	extern cvar_t sv_gravity, sv_cheats, sv_maxspeed, skill;
@@ -1850,7 +1850,7 @@ void M_Menu_Singleplayer_Cheats_Quake2_f (void)
 
 	cursorpositionY = (y + 24);
 
-	#ifndef MINIMAL
+	#ifndef CLIENTONLY
 	currentskill = skill.value;
 
 	if ( !currentskill )
diff --git a/engine/client/pr_csqc.c b/engine/client/pr_csqc.c
index 5276f08c8..cdbc532d4 100644
--- a/engine/client/pr_csqc.c
+++ b/engine/client/pr_csqc.c
@@ -707,10 +707,6 @@ static qboolean CopyCSQCEdictToEntity(csqcedict_t *in, entity_t *out)
 	cs_getframestate(in, rflags, &out->framestate);
 
 	VectorCopy(in->v->origin, out->origin);
-	{
-		extern cvar_t temp1;
-	out->origin[2] += temp1.value;
-	}
 	if (rflags & CSQCRF_USEAXIS)
 	{
 		VectorCopy(csqcg.forward, out->axis[0]);