diff --git a/engine/gl/gl_heightmap.c b/engine/gl/gl_heightmap.c
index 671213a92..1b2e087e2 100644
--- a/engine/gl/gl_heightmap.c
+++ b/engine/gl/gl_heightmap.c
@@ -346,8 +346,9 @@ static qboolean Terr_IsSectionFName(heightmap_t *hm, char *fname, int *sx, int *
 }
 static hmsection_t *Terr_ReadSection(heightmap_t *hm, hmsection_t *s, int sx, int sy, void *filebase, unsigned int filelen)
 {
-	int i, j;
+	int i;
 #ifndef SERVERONLY
+	int j;
 	dsmesh_t *dm;
 	unsigned char *lm;
 	float *colours;
diff --git a/engine/server/svmodel.c b/engine/server/svmodel.c
index 18afea66c..2a4a35f78 100644
--- a/engine/server/svmodel.c
+++ b/engine/server/svmodel.c
@@ -137,7 +137,7 @@ int SVQ1_RecursiveLightPoint3C (model_t *model, mnode_t *node, vec3_t start, vec
 
 			lightmap += (dt * ((surf->extents[0])+1) + ds)*3;
 
-			for (maps = 0 ; maps < MAXLIGHTMAPS && surf->styles[maps] != 255 ;
+			for (maps = 0 ; maps < MAXQ1LIGHTMAPS && surf->styles[maps] != 255 ;
 					maps++)
 			{
 				scale = sv.strings.lightstyles[surf->styles[maps]][0];
@@ -1125,7 +1125,7 @@ qboolean Mod_LoadFaces (lump_t *l, qboolean lm)
 			out->firstedge = LittleLong(inl->firstedge);
 			out->numedges = LittleLong(inl->numedges);
 			tn = LittleLong (inl->texinfo);
-			for (i=0 ; i<MAXLIGHTMAPS ; i++)
+			for (i=0 ; i<MAXQ1LIGHTMAPS ; i++)
 				out->styles[i] = inl->styles[i];
 			lofs = LittleLong(inl->lightofs);
 			inl++;
@@ -1137,7 +1137,7 @@ qboolean Mod_LoadFaces (lump_t *l, qboolean lm)
 			out->firstedge = LittleLong(ins->firstedge);
 			out->numedges = LittleShort(ins->numedges);
 			tn = LittleShort (ins->texinfo);
-			for (i=0 ; i<MAXLIGHTMAPS ; i++)
+			for (i=0 ; i<MAXQ1LIGHTMAPS ; i++)
 				out->styles[i] = ins->styles[i];
 			lofs = LittleLong(ins->lightofs);
 			ins++;