diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index af4ea72b1..7f1e7f09b 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -7022,8 +7022,8 @@ static void run_font_scanner(void)
   char *buf = malloc(size);
   char *walk = buf;
 //  printf("Sending %u bytes with %u families.\n", size, num_font_families);
-  *walk++ = num_font_families & 0xff;
-  *walk++ = num_font_families >> 8;
+  *walk++ = num_font_families & 0xffu;
+  *walk++ = num_font_families >> 8u;
   i = num_font_families;
   while(i--)
     {
@@ -7127,7 +7127,7 @@ static void receive_some_font_info(void)
   show_progress_bar();
   unsigned char *walk = buf;
   num_font_families = *walk++;
-  num_font_families += *walk++ << 8;
+  num_font_families += *walk++ << 8u;
 //  printf("Got %u bytes with %u families.\n", buf_fill, num_font_families);
   user_font_families = malloc(num_font_families * sizeof *user_font_families);
   family_info *fip = malloc(num_font_families * sizeof **user_font_families);