diff --git a/engine/client/cl_main.c b/engine/client/cl_main.c
index 9d6be8cfd..ec4998160 100644
--- a/engine/client/cl_main.c
+++ b/engine/client/cl_main.c
@@ -3826,7 +3826,7 @@ void Host_Init (quakeparms_t *parms)
 	CDAudio_Init ();
 	Sbar_Init ();
 	CL_Init ();
-#if defined(SERVERONLY) || !(defined(CSQC_DAT) || defined(MENU_DAT))
+#if defined(CSQC_DAT) || defined(MENU_DAT)
 	PF_Common_RegisterCvars();
 #endif
 
diff --git a/engine/client/r_surf.c b/engine/client/r_surf.c
index b260389b8..7ef8ffc6c 100644
--- a/engine/client/r_surf.c
+++ b/engine/client/r_surf.c
@@ -2626,7 +2626,9 @@ void Surf_Clear(model_t *mod)
 	BZ_Free(mod->shadowbatches);
 	mod->numshadowbatches = 0;
 	mod->shadowbatches = NULL;
+#ifdef RTLIGHTS
 	Sh_PurgeShadowMeshes();
+#endif
 }
 
 //pick fastest mode for lightmap data
diff --git a/engine/server/sv_main.c b/engine/server/sv_main.c
index 4e49746e7..e8d3b051f 100644
--- a/engine/server/sv_main.c
+++ b/engine/server/sv_main.c
@@ -4831,10 +4831,12 @@ void SV_Init (quakeparms_t *parms)
 #endif
 		COM_Init ();
 		Mod_Init ();
-
-		PF_Common_RegisterCvars();
 	}
 
+#if !(defined(CSQC_DAT) || defined(MENU_DAT))
+	PF_Common_RegisterCvars();
+#endif
+
 	PR_Init ();
 
 	SV_InitNet ();