diff --git a/engine/common/gl_q2bsp.c b/engine/common/gl_q2bsp.c
index d25c51cea..9ce15a38d 100644
--- a/engine/common/gl_q2bsp.c
+++ b/engine/common/gl_q2bsp.c
@@ -1660,14 +1660,14 @@ qboolean CMod_LoadLeafs (lump_t *l)
 		}
 
 		out->contents = LittleLong (in->contents);
-		out->cluster = LittleShort (in->cluster);
+		out->cluster = (unsigned short)LittleShort (in->cluster);
 		out->area = LittleShort (in->area);
-		out->firstleafbrush = LittleShort (in->firstleafbrush);
-		out->numleafbrushes = LittleShort (in->numleafbrushes);
+		out->firstleafbrush = (unsigned short)LittleShort (in->firstleafbrush);
+		out->numleafbrushes = (unsigned short)LittleShort (in->numleafbrushes);
 
 		out->firstmarksurface = loadmodel->marksurfaces +
-			LittleShort(in->firstleafface);
-		out->nummarksurfaces = LittleShort(in->numleaffaces);
+			(unsigned short)LittleShort(in->firstleafface);
+		out->nummarksurfaces = (unsigned short)LittleShort(in->numleaffaces);
 
 		if (out->cluster >= numclusters)
 			numclusters = out->cluster + 1;
diff --git a/engine/gl/gl_model.c b/engine/gl/gl_model.c
index 71f2cabbb..0ea5bc9d2 100644
--- a/engine/gl/gl_model.c
+++ b/engine/gl/gl_model.c
@@ -2032,8 +2032,8 @@ qboolean GLMod_LoadLeafs (lump_t *l)
 		out->contents = p;
 
 		out->firstmarksurface = loadmodel->marksurfaces +
-			LittleShort(in->firstmarksurface);
-		out->nummarksurfaces = LittleShort(in->nummarksurfaces);
+			(unsigned short)LittleShort(in->firstmarksurface);
+		out->nummarksurfaces = (unsigned short)LittleShort(in->nummarksurfaces);
 		
 		p = LittleLong(in->visofs);
 		if (p == -1)
@@ -2416,8 +2416,8 @@ qboolean GLMod_LoadMarksurfaces (lump_t *l)
 
 	for ( i=0 ; i<count ; i++)
 	{
-		j = LittleShort(in[i]);
-		if (j < 0 || j >= loadmodel->numsurfaces)
+		j = (unsigned short)LittleShort(in[i]);
+		if (j >= loadmodel->numsurfaces)
 		{
 			Con_Printf (CON_ERROR "Mod_ParseMarksurfaces: bad surface number\n");
 			return false;
diff --git a/engine/server/pr_cmds.c b/engine/server/pr_cmds.c
index e1934bde0..92bfb89ce 100644
--- a/engine/server/pr_cmds.c
+++ b/engine/server/pr_cmds.c
@@ -10737,7 +10737,7 @@ BuiltinList_t BuiltinList[] = {				//nq	qw		h2		ebfs
 	{"sqlerror",		PF_sqlerror,		0,		0,		0,		255},	// #255 string(float serveridx, [float queryidx]) sqlerror (FTE_SQL)
 	{"sqlescape",		PF_sqlescape,		0,		0,		0,		256},	// #256 string(float serveridx, string data) sqlescape (FTE_SQL)
 	{"sqlversion",		PF_sqlversion,		0,		0,		0,		257},	// #257 string(float serveridx) sqlversion (FTE_SQL)
-	{"sqlreadfloat",	PF_sqlreadfloat,	0,		0,		0,		258},	// #258 float(float serveridx, float queryidx, float row, float column) sqlreadfield (FTE_SQL)
+	{"sqlreadfloat",	PF_sqlreadfloat,	0,		0,		0,		258},	// #258 float(float serveridx, float queryidx, float row, float column) sqlreadfloat (FTE_SQL)
 #endif
 
 //EXT_CSQC
diff --git a/engine/server/svmodel.c b/engine/server/svmodel.c
index 647979188..44b5523fd 100644
--- a/engine/server/svmodel.c
+++ b/engine/server/svmodel.c
@@ -1193,8 +1193,8 @@ qboolean Mod_LoadLeafs (lump_t *l)
 		out->contents = p;
 
 		out->firstmarksurface = loadmodel->marksurfaces +
-			LittleShort(in->firstmarksurface);
-		out->nummarksurfaces = LittleShort(in->nummarksurfaces);
+			(unsigned short)LittleShort(in->firstmarksurface);
+		out->nummarksurfaces = (unsigned short)LittleShort(in->nummarksurfaces);
 
 		p = LittleLong(in->visofs);
 		if (p == -1)
@@ -1387,7 +1387,7 @@ void Mod_LoadMarksurfaces (lump_t *l)
 
 	for ( i=0 ; i<count ; i++)
 	{
-		j = LittleShort(in[i]);
+		j = (unsigned short)LittleShort(in[i]);
 		if (j >= loadmodel->numsurfaces)
 			SV_Error ("Mod_ParseMarksurfaces: bad surface number");
 		out[i] = loadmodel->surfaces + j;
diff --git a/engine/sw/sw_model.c b/engine/sw/sw_model.c
index d7b411c11..7ba23f0b8 100644
--- a/engine/sw/sw_model.c
+++ b/engine/sw/sw_model.c
@@ -1509,8 +1509,8 @@ qboolean SWMod_LoadLeafs (lump_t *l)
 		out->contents = p;
 
 		out->firstmarksurface = loadmodel->marksurfaces +
-			LittleShort(in->firstmarksurface);
-		out->nummarksurfaces = LittleShort(in->nummarksurfaces);
+			(unsigned short)LittleShort(in->firstmarksurface);
+		out->nummarksurfaces = (unsigned short)LittleShort(in->nummarksurfaces);
 		
 		p = LittleLong(in->visofs);
 		if (p == -1)
@@ -1845,7 +1845,7 @@ qboolean SWMod_LoadMarksurfaces (lump_t *l)
 
 	for ( i=0 ; i<count ; i++)
 	{
-		j = LittleShort(in[i]);
+		j = (unsigned short)LittleShort(in[i]);
 		if (j >= loadmodel->numsurfaces)
 		{
 			Con_Printf (CON_ERROR "Mod_ParseMarksurfaces: bad surface number\n");