diff --git a/engine/gl/gl_heightmap.c b/engine/gl/gl_heightmap.c
index 0bdec8586..f882d6d3b 100644
--- a/engine/gl/gl_heightmap.c
+++ b/engine/gl/gl_heightmap.c
@@ -265,8 +265,8 @@ static hmsection_t *Terr_LoadSection(heightmap_t *hm, hmsection_t *s, int sx, in
 #ifndef SERVERONLY
 	dsmesh_t *dm;
 	unsigned char *lm;
-#endif
 	float *colours;
+#endif
 	void *ptr;
 
 	/*queue the file for download if we don't have it yet*/
@@ -428,6 +428,7 @@ static hmsection_t *Terr_LoadSection(heightmap_t *hm, hmsection_t *s, int sx, in
 	{
 		s->flags |= TSF_RELIGHT;
 
+#ifndef SERVERONLY
 		if (s->lightmap >= 0)
 		{
 			lm = lightmap[s->lightmap]->lightmaps;
@@ -450,6 +451,7 @@ static hmsection_t *Terr_LoadSection(heightmap_t *hm, hmsection_t *s, int sx, in
 			s->colours[i][2] = 1;
 			s->colours[i][3] = 1;
 		}
+#endif
 
 #if 0//def DEBUG
 		void *f;
diff --git a/engine/server/svmodel.c b/engine/server/svmodel.c
index eaf1297d4..b9338f40b 100644
--- a/engine/server/svmodel.c
+++ b/engine/server/svmodel.c
@@ -1193,7 +1193,7 @@ qboolean Mod_LoadNodes (lump_t *l, qboolean lm)
 
 	if (lm)
 	{
-		dlnode_t		*in;
+		dl1node_t		*in;
 		in = (void *)(mod_base + l->fileofs);
 		if (l->filelen % sizeof(*in))
 		{
@@ -1286,7 +1286,7 @@ qboolean Mod_LoadLeafs (lump_t *l, qboolean lm)
 
 	if (lm)
 	{
-		dlleaf_t 	*in;
+		dl1leaf_t 	*in;
 		in = (void *)(mod_base + l->fileofs);
 		if (l->filelen % sizeof(*in))
 		{
@@ -1749,7 +1749,7 @@ qboolean Mod_LoadBrushModel (model_t *mod, void *buffer)
 	i = LittleLong (header->version);
 
 
-	if (i == BSPVERSION_LONG)
+	if (i == BSPVERSION_LONG1)
 	{
 		loadmodel->fromgame = fg_quake;
 		longm = true;