diff --git a/engine/common/q3common.c b/engine/common/q3common.c
index 2f239b80..e9c2b59a 100644
--- a/engine/common/q3common.c
+++ b/engine/common/q3common.c
@@ -366,18 +366,22 @@ int VMQ3_Cvar_Register(q3vmcvar_t *v, char *name, char *defval, int flags)
 	c = Cvar_Get(name, defval, fteflags, "Q3VM cvars");
 	if (!c)	//command name, etc
 		return 0;
+#ifndef SERVERONLY
 	if ((flags & CVAR_USERINFO) && !(c->flags & CVAR_USERINFO))
 	{
 		c->flags |= CVAR_USERINFO;
 		Info_SetValueForKey(cls.userinfo[0], c->name, c->string, sizeof(cls.userinfo[0]));
 		cls.resendinfo = true;
 	}
+#endif
+#ifndef CLIENTONLY
 	if ((flags & CVAR_SERVERINFO) && !(c->flags & CVAR_SERVERINFO))
 	{
 		c->flags |= CVAR_SERVERINFO;
 		Info_SetValueForKey (svs.info, c->name, c->string, MAX_SERVERINFO_STRING);
 		SV_SendServerInfoChange(c->name, c->string);
 	}
+#endif
 	for (i = 0; i < MAX_VMQ3_CVARS; i++)
 	{
 		if (!q3cvlist[i])
diff --git a/engine/qclib/pr_edict.c b/engine/qclib/pr_edict.c
index 2e489143..dcd16388 100644
--- a/engine/qclib/pr_edict.c
+++ b/engine/qclib/pr_edict.c
@@ -2712,6 +2712,7 @@ retry:
 				break;
 			default:
 				Sys_Error("Bad struct type");
+				len = 0;
 			}
 			s = PRHunkAlloc(progfuncs, len, "dstatements");
 			QC_decode(progfuncs, PRLittleLong(*(int *)pr_statements16), len, 2, (char *)(((int *)pr_statements16)+1), s);
@@ -2730,6 +2731,7 @@ retry:
 				break;
 			default:
 				Sys_Error("Bad struct type");
+				len = 0;
 			}
 			s = PRHunkAlloc(progfuncs, len, "dglobaldefs");
 			QC_decode(progfuncs, PRLittleLong(*(int *)pr_globaldefs16), len, 2, (char *)(((int *)pr_globaldefs16)+1), s);
@@ -2748,6 +2750,7 @@ retry:
 				break;
 			default:
 				Sys_Error("Bad struct type");
+				len = 0;
 			}
 			s = PRHunkAlloc(progfuncs, len, "progfieldtable");
 			QC_decode(progfuncs, PRLittleLong(*(int *)pr_fielddefs16), len, 2, (char *)(((int *)pr_fielddefs16)+1), s);