diff --git a/nq/source/cl_ents.c b/nq/source/cl_ents.c
index 588753fd2..92ea20f5b 100644
--- a/nq/source/cl_ents.c
+++ b/nq/source/cl_ents.c
@@ -271,7 +271,7 @@ CL_RelinkEntities (void)
 			f = frac;
 			ent->old_origin = Transform_GetWorldPosition (ent->transform);
 			// If the delta is large, assume a teleport and don't lerp
-			if (fabs (delta[0]) > 100 || fabs (delta[1] > 100)
+			if (fabs (delta[0]) > 100 || fabs (delta[1]) > 100
 				|| fabs (delta[2]) > 100) {
 				// assume a teleportation, not a motion
 				CL_TransformEntity (ent, new->scale / 16.0, new->angles,
diff --git a/nq/source/sv_move.c b/nq/source/sv_move.c
index 3970f6d78..cb94c1c89 100644
--- a/nq/source/sv_move.c
+++ b/nq/source/sv_move.c
@@ -294,7 +294,7 @@ SV_NewChaseDir (edict_t *actor, edict_t *enemy, float dist)
 			return;
 	}
 	// try other directions
-	if (((rand () & 3) & 1) || abs (deltay) > abs (deltax)) {
+	if (((rand () & 3) & 1) || fabsf (deltay) > fabsf (deltax)) {
 		tdir = d[1];
 		d[1] = d[2];
 		d[2] = tdir;
diff --git a/qw/source/cl_ents.c b/qw/source/cl_ents.c
index c0cd30bd1..5e9bb0069 100644
--- a/qw/source/cl_ents.c
+++ b/qw/source/cl_ents.c
@@ -240,7 +240,7 @@ CL_LinkPacketEntities (void)
 			vec4f_t     delta = new->origin - old->origin;
 			f = frac;
 			// If the delta is large, assume a teleport and don't lerp
-			if (fabs (delta[0]) > 100 || fabs (delta[1] > 100)
+			if (fabs (delta[0]) > 100 || fabs (delta[1]) > 100
 				|| fabs (delta[2]) > 100) {
 				// assume a teleportation, not a motion
 				CL_TransformEntity (ent, new->scale / 16, new->angles,
diff --git a/qw/source/sv_move.c b/qw/source/sv_move.c
index c500e30ed..9df58daa0 100644
--- a/qw/source/sv_move.c
+++ b/qw/source/sv_move.c
@@ -293,7 +293,7 @@ SV_NewChaseDir (edict_t *actor, edict_t *enemy, float dist)
 			return;
 	}
 	// try other directions
-	if (((rand () & 3) & 1) || abs (deltay) > abs (deltax)) {
+	if (((rand () & 3) & 1) || fabsf (deltay) > fabsf (deltax)) {
 		tdir = d[1];
 		d[1] = d[2];
 		d[2] = tdir;
diff --git a/tools/bsp2img/bsp2img.c b/tools/bsp2img/bsp2img.c
index 5301e09fe..f469e6bf9 100644
--- a/tools/bsp2img/bsp2img.c
+++ b/tools/bsp2img/bsp2img.c
@@ -820,7 +820,7 @@ render_map (bsp_t *bsp)
 		vert1 = &vertexlist[edgelist[i].v[0]];
 		vert2 = &vertexlist[edgelist[i].v[1]];
 		SUB (*vert1, *vert2, vect);
-		if (abs (tempf) < options.flat_threshold
+		if (fabsf (tempf) < options.flat_threshold
 			&& usearea > options.area_threshold
 			&& sqrt (DOT (vect, vect)) > options.linelen_threshold) {
 			float       offs0, offs1;
diff --git a/tools/qflight/include/entities.h b/tools/qflight/include/entities.h
index 6f3d1dd12..0873369d7 100644
--- a/tools/qflight/include/entities.h
+++ b/tools/qflight/include/entities.h
@@ -56,7 +56,7 @@ typedef struct entity_s {
 	const char *classname;
 	vec3_t      origin;
 	vec_t       angle;
-	int         light;
+	vec_t       light;
 
 	int         sun_light[2];
 	vec3_t      sun_color[2];
diff --git a/tools/qflight/source/entities.c b/tools/qflight/source/entities.c
index 8c2260fcd..85ce43431 100644
--- a/tools/qflight/source/entities.c
+++ b/tools/qflight/source/entities.c
@@ -241,7 +241,7 @@ LoadEntities (void)
 		}
 
 		if (options.verbosity > 1 && entity->targetname)
-			printf ("%s %d %d\n", entity->targetname, entity->light,
+			printf ("%s %g %d\n", entity->targetname, entity->light,
 					entity->style);
 
 		// all fields have been parsed