diff --git a/engine/client/m_download.c b/engine/client/m_download.c
index daf7945dc..72dddb3d3 100644
--- a/engine/client/m_download.c
+++ b/engine/client/m_download.c
@@ -230,7 +230,9 @@ static qboolean PM_SignatureOkay(package_t *p);
 static void PM_FreePackage(package_t *p)
 {
 	struct packagedep_s *d;
+#ifdef WEBCLIENT
 	int i;
+#endif
 
 	if (p->link)
 	{
@@ -4049,8 +4051,10 @@ void QCBUILTIN PF_cl_getpackagemanagerinfo(pubprogfuncs_t *prinst, struct global
 				RETURN_TSTRING(va("%lu", (unsigned long)p->filesize));
 			break;
 		case GPMI_AVAILABLE:
+#ifdef WEBCLIENT
 			if (PM_SignatureOkay(p))
 				RETURN_TSTRING("1");
+#endif
 			break;
 
 		case GPMI_INSTALLED:
@@ -4060,10 +4064,12 @@ void QCBUILTIN PF_cl_getpackagemanagerinfo(pubprogfuncs_t *prinst, struct global
 				RETURN_TSTRING("enabled");	//its there (and in use)
 			else if (p->flags & DPF_PRESENT)
 				RETURN_TSTRING("present");	//its there (but ignored)
+#ifdef WEBCLIENT
 			else if (p->download)
 				RETURN_TSTRING(va("%i%%", (int)p->download->qdownload.percent));	//we're downloading it.
 			else if (p->trymirrors)
 				RETURN_TSTRING("pending");	//its queued.
+#endif
 			break;
 		case GPMI_GAMEDIR:
 			RETURN_TSTRING(p->gamedir);
diff --git a/engine/client/snd_al.c b/engine/client/snd_al.c
index a3f440c5a..7d513808c 100644
--- a/engine/client/snd_al.c
+++ b/engine/client/snd_al.c
@@ -34,6 +34,7 @@ We also have no doppler with WebAudio.
 	#define OPENAL_STATIC		//our javascript port doesn't support dynamic linking  (bss+data segments get too messy).
 	#define SDRVNAME "WebAudio"	//IE doesn't support webaudio, resulting in noticable error messages about no openal, which is technically incorrect. So lets be clear about this.
 	#define SDRVNAMEDESC "WebAudio:"
+	qboolean firefoxstaticsounds;	//FireFox bugs out with static sounds. they all end up full volume AND THIS IS REALLY LOUD AND REALLY ANNOYING.
 #else
 	#define SDRVNAME "OpenAL"
 	#define SDRVNAMEDESC "OAL:"
diff --git a/engine/gl/gl_backend.c b/engine/gl/gl_backend.c
index 34d680b15..40559b548 100644
--- a/engine/gl/gl_backend.c
+++ b/engine/gl/gl_backend.c
@@ -5533,7 +5533,6 @@ void GLBE_UpdateLightmaps(void)
 			{
 				extern cvar_t r_lightmap_nearest;
 				TEXASSIGN(lm->lightmap_texture, Image_CreateTexture(va("***lightmap %i***", lmidx), NULL, (r_lightmap_nearest.ival?IF_NEAREST:IF_LINEAR)|IF_NOMIPMAP));
-				lm->lightmap_texture->format = lm->fmt;
 				qglGenTextures(1, &lm->lightmap_texture->num);
 				GL_MTBind(0, GL_TEXTURE_2D, lm->lightmap_texture);
 				qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
@@ -5560,6 +5559,13 @@ void GLBE_UpdateLightmaps(void)
 					qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_B, gl_config.formatinfo[lm->fmt].swizzle_b);
 					qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_A, gl_config.formatinfo[lm->fmt].swizzle_a);
 				}
+
+				//for completeness.
+				lm->lightmap_texture->format = lm->fmt;
+				lm->lightmap_texture->width = lm->width;
+				lm->lightmap_texture->height = lm->height;
+				lm->lightmap_texture->depth = 1;
+				lm->lightmap_texture->status = TEX_LOADED;
 			}
 			else
 			{
diff --git a/engine/server/sv_main.c b/engine/server/sv_main.c
index fde50526e..8754cdf1b 100644
--- a/engine/server/sv_main.c
+++ b/engine/server/sv_main.c
@@ -2620,6 +2620,7 @@ void SV_DoDirectConnect(svconnectinfo_t *fte_restrict info)
 
 	if (!newcl)	//client has no slot. It's possible to bipass this if server is loading a game. (or a duplicated qsocket)
 	{
+#ifdef SUBSERVERS
 		if (SSV_IsSubServer())
 		{
 			if (1)
@@ -2646,6 +2647,7 @@ void SV_DoDirectConnect(svconnectinfo_t *fte_restrict info)
 				return;
 			}
 		}
+#endif
 
 		/*single player logic*/
 		if (sv.allocated_client_slots == 1 && info->adr.type == NA_LOOPBACK)