diff --git a/libs/util/quakefs.c b/libs/util/quakefs.c
index a8d2bda41..422cd9212 100644
--- a/libs/util/quakefs.c
+++ b/libs/util/quakefs.c
@@ -621,10 +621,10 @@ qstrcmp (char **os1, char **os2)
 	while (1) {
 		in1 = in2 = n1 = n2 = 0;
 
-		if ((in1 = isdigit ((int) *s1)))
+		if ((in1 = isdigit ((byte) *s1)))
 			n1 = strtol (s1, &s1, 10);
 
-		if ((in2 = isdigit ((int) *s2)))
+		if ((in2 = isdigit ((byte) *s2)))
 			n2 = strtol (s2, &s2, 10);
 
 		if (in1 && in2) {
diff --git a/libs/util/ver_check.c b/libs/util/ver_check.c
index cce3284e3..2a00c212e 100644
--- a/libs/util/ver_check.c
+++ b/libs/util/ver_check.c
@@ -57,11 +57,13 @@ ver_compare (const char *value, const char *reference)
 
 	for (;;) {
 		valptr = value;
-		while (*valptr && !isdigit ((int) *valptr))	// Scan past any non-digits
+		// Scan past any non-digits
+		while (*valptr && !isdigit ((byte) *valptr))
 			valptr++;
 
 		refptr = reference;
-		while (*refptr && !isdigit ((int) *refptr))	// get past non-digits
+		// get past non-digits
+		while (*refptr && !isdigit ((byte) *refptr))
 			refptr++;
 
 		for (;;) {
@@ -85,10 +87,10 @@ ver_compare (const char *value, const char *reference)
 
 		vl = rl = 0;
 
-		if (isdigit ((int) *valptr))
+		if (isdigit ((byte) *valptr))
 			vl = strtol (value, (char **) &value, 10);
 
-		if (isdigit ((int) *refptr))
+		if (isdigit ((byte) *refptr))
 			rl = strtol (reference, (char **) &reference, 10);
 
 		if (vl != rl)
diff --git a/qw/source/cl_main.c b/qw/source/cl_main.c
index f993aede5..48b5e2952 100644
--- a/qw/source/cl_main.c
+++ b/qw/source/cl_main.c
@@ -927,7 +927,7 @@ CL_ConnectionlessPacket (void)
 
 		s = MSG_ReadString (net_message);
 
-		while (*s && isspace ((int) *s))
+		while (*s && isspace ((byte) *s))
 			s++;
 		len = strlen (s);
 		while (len && isspace ((byte) s[len - 1]))
diff --git a/qw/source/sv_user.c b/qw/source/sv_user.c
index 1cab08e45..21c2c432a 100644
--- a/qw/source/sv_user.c
+++ b/qw/source/sv_user.c
@@ -735,7 +735,7 @@ SV_BeginDownload_f (ucmd_t *cmd)
 		char *n = p;
 
 		while (*name)
-			*p++ = tolower ((int) *name++);
+			*p++ = tolower ((byte) *name++);
 		*p = 0;
 		name = n;
 	}