diff --git a/engine/Makefile b/engine/Makefile
index 2dfc1c643..1786a6250 100644
--- a/engine/Makefile
+++ b/engine/Makefile
@@ -586,17 +586,17 @@ endif
 ifeq ($(FTE_TARGET),morphos)
 	BASELDFLAGS=-lm
 endif
-ifeq ($(FTE_TARGET),bsd)
+ifneq (,$(findstring bsd,$(FTE_TARGET)))
 	BASELDFLAGS=-lm
 	VISIBILITY_FLAGS=-fvisibility=hidden
 endif
-ifeq ($(FTE_TARGET),linux)
+ifneq (,$(findstring linux,$(FTE_TARGET)))
 	VISIBILITY_FLAGS=-fvisibility=hidden
 endif
-ifeq ($(FTE_TARGET),droid)
+ifneq (,$(findstring droid,$(FTE_TARGET)))
 	VISIBILITY_FLAGS=-fvisibility=hidden
 endif
-ifeq ($(FTE_TARGET),macosx)
+ifneq (,$(findstring macos,$(FTE_TARGET)))
 	VISIBILITY_FLAGS=-fvisibility=hidden
 endif
 BASELDFLAGS ?= -lm -ldl -lpthread
diff --git a/engine/client/cl_main.c b/engine/client/cl_main.c
index e388073dd..9143000c1 100644
--- a/engine/client/cl_main.c
+++ b/engine/client/cl_main.c
@@ -5868,8 +5868,10 @@ done:
 
 	if (f->flags & HRF_PACKAGE)
 	{
+#ifdef PACKAGEMANAGER
 		Z_Free(f->packageinfo);
 		f->packageinfo = PM_GeneratePackageFromMeta(f->srcfile, qname,sizeof(qname), &qroot);
+#endif
 	}
 	else if (f->flags & HRF_MANIFEST)
 	{
@@ -5961,8 +5963,10 @@ done:
 			f->dstfile = NULL;
 		}
 
+#ifdef PACKAGEMANAGER
 		if (f->flags & HRF_PACKAGE)
 			PM_FileInstalled(COM_SkipPath(f->fname), qroot, f->packageinfo, true);
+#endif
 
 		Cbuf_AddText(loadcommand, RESTRICT_LOCAL);
 	}
diff --git a/engine/client/cl_parse.c b/engine/client/cl_parse.c
index 9da475cc1..364058ba2 100644
--- a/engine/client/cl_parse.c
+++ b/engine/client/cl_parse.c
@@ -2564,8 +2564,9 @@ void DL_Abort(qdownload_t *dl, enum qdlabort aborttype)
 					Con_Printf("Couldn't rename %s to %s\n", nativetmp, nativefinal);
 				}
 			}
-
+#ifdef PACKAGEMANAGER
 			PM_FileInstalled(dl->localname, dl->fsroot, NULL, true);
+#endif
 		}
 		else
 		{
diff --git a/engine/client/m_download.c b/engine/client/m_download.c
index 397fe42c0..8fb71cef4 100644
--- a/engine/client/m_download.c
+++ b/engine/client/m_download.c
@@ -1711,11 +1711,11 @@ static qboolean PM_FileInstalled_Internal(const char *package, const char *categ
 
 	if (pkgflags&DPF_PLUGIN)
 		p->arch = Z_StrDup(THISARCH);
-	if (!p->name)
+	if (!p->name || !*p->name)
 		p->name = Z_StrDup(package);
-	if (!p->title)
+	if (!p->title || !*p->title)
 		p->title = Z_StrDup(title);
-	if (!p->category && !*p->category)
+	if (!p->category || !*p->category)
 		p->category = Z_StrDup(category);
 	p->flags = pkgflags|DPF_NATIVE|DPF_FORGETONUNINSTALL;
 	if (enable)
diff --git a/engine/client/m_mp3.c b/engine/client/m_mp3.c
index 368b14911..9338ef0ae 100644
--- a/engine/client/m_mp3.c
+++ b/engine/client/m_mp3.c
@@ -4217,6 +4217,7 @@ void Media_RecordDemo_f(void)
 
 void Media_CaptureDemoEnd(void) {}
 qboolean Media_PausedDemo(qboolean fortiming) {return false;}
+int Media_Capturing (void) { return 0; }
 double Media_TweekCaptureFrameTime(double oldtime, double time) { return oldtime+time ; }
 void Media_RecordFrame (void) {}
 void Media_VideoRestarting(void) {}
diff --git a/engine/common/pr_bgcmd.c b/engine/common/pr_bgcmd.c
index 77f76b770..0cb82d8b2 100644
--- a/engine/common/pr_bgcmd.c
+++ b/engine/common/pr_bgcmd.c
@@ -7645,6 +7645,7 @@ qc_extension_t QSG_Extensions[] = {
 	{"DP_SV_CLIENTCAMERA",				NULL,	0,{NULL}, "Works like svc_setview except also handles pvs."},
 	{"DP_SV_CLIENTCOLORS",				NULL,	0,{NULL}, "Provided only for compatibility with DP."},
 	{"DP_SV_CLIENTNAME",				NULL,	0,{NULL}, "Provided only for compatibility with DP."},
+	{"DP_SV_CUSTOMIZEENTITYFORCLIENT",	NULL,	0,{NULL}, "Deprecated feature for compat with DP. Can be slow, incompatible with splitscreen, usually malfunctions with mvds."},
 	{"DP_SV_DRAWONLYTOCLIENT"},
 	{"DP_SV_DROPCLIENT",				NULL,	1,{"dropclient"}, "Equivelent to quakeworld's stuffcmd(self,\"disconnect\\n\"); hack"},
 	{"DP_SV_EFFECT",					NULL,	1,{"effect"}},