diff --git a/gio/giomodule.c b/gio/giomodule.c
index a2909a8ef..d3b5e482a 100644
--- a/gio/giomodule.c
+++ b/gio/giomodule.c
@@ -731,7 +731,7 @@ print_help (const char        *envvar,
     {
       GList *l;
       GIOExtension *extension;
-      int width = 0;
+      gsize width = 0;
 
       for (l = g_io_extension_point_get_extensions (ep); l; l = l->next)
         {
@@ -743,7 +743,9 @@ print_help (const char        *envvar,
         {
           extension = l->data;
 
-          g_print (" %*s - %d\n", width, g_io_extension_get_name (extension), g_io_extension_get_priority (extension));
+          g_print (" %*s - %d\n", (int) MIN (width, G_MAXINT),
+                   g_io_extension_get_name (extension),
+                   g_io_extension_get_priority (extension));
         }
     }
 }
diff --git a/gio/gresource-tool.c b/gio/gresource-tool.c
index 1914c5228..aa718974e 100644
--- a/gio/gresource-tool.c
+++ b/gio/gresource-tool.c
@@ -180,17 +180,18 @@ elf_foreach_resource_section (Elf             *elf,
                               SectionCallback  callback,
                               gpointer         data)
 {
+  int ret;
   size_t shstrndx, shnum;
   size_t scnidx;
   Elf_Scn *scn;
   GElf_Shdr *shdr, shdr_mem;
   const gchar *section_name;
 
-  elf_getshdrstrndx (elf, &shstrndx);
-  g_assert (shstrndx >= 0);
+  ret = elf_getshdrstrndx (elf, &shstrndx);
+  g_assert (ret == 0);
 
-  elf_getshdrnum (elf, &shnum);
-  g_assert (shnum >= 0);
+  ret = elf_getshdrnum (elf, &shnum);
+  g_assert (ret == 0);
 
   for (scnidx = 1; scnidx < shnum; scnidx++)
     {
diff --git a/gio/gsettings-tool.c b/gio/gsettings-tool.c
index 3096f9d9b..7559a6b1b 100644
--- a/gio/gsettings-tool.c
+++ b/gio/gsettings-tool.c
@@ -191,13 +191,16 @@ static void
 gsettings_list_children (void)
 {
   gchar **children;
-  gint max = 0;
+  gsize max = 0;
   gint i;
 
   children = g_settings_list_children (global_settings);
   for (i = 0; children[i]; i++)
-    if (strlen (children[i]) > max)
-      max = strlen (children[i]);
+    {
+      gsize len = strlen (children[i]);
+      if (len > max)
+        max = len;
+    }
 
   for (i = 0; children[i]; i++)
     {
@@ -212,9 +215,11 @@ gsettings_list_children (void)
                     NULL);
 
       if (g_settings_schema_get_path (schema) != NULL)
-        g_print ("%-*s   %s\n", max, children[i], g_settings_schema_get_id (schema));
+        g_print ("%-*s   %s\n", (int) MIN (max, G_MAXINT), children[i],
+                 g_settings_schema_get_id (schema));
       else
-        g_print ("%-*s   %s:%s\n", max, children[i], g_settings_schema_get_id (schema), path);
+        g_print ("%-*s   %s:%s\n", (int) MIN (max, G_MAXINT), children[i],
+                 g_settings_schema_get_id (schema), path);
 
       g_object_unref (child);
       g_settings_schema_unref (schema);
diff --git a/gio/gunixsocketaddress.c b/gio/gunixsocketaddress.c
index 0ab1a62e9..69204e9b9 100644
--- a/gio/gunixsocketaddress.c
+++ b/gio/gunixsocketaddress.c
@@ -214,7 +214,8 @@ g_unix_socket_address_to_native (GSocketAddress *address,
   gssize socklen;
 
   socklen = g_unix_socket_address_get_native_size (address);
-  if (destlen < socklen)
+  g_assert (socklen >= 0);
+  if (destlen < (gsize) socklen)
     {
       g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NO_SPACE,
 			   _("Not enough space for socket address"));
diff --git a/gio/tests/contenttype.c b/gio/tests/contenttype.c
index 71e8b0df6..f2faaf68d 100644
--- a/gio/tests/contenttype.c
+++ b/gio/tests/contenttype.c
@@ -363,7 +363,7 @@ test_tree (void)
   const gchar *path;
   GFile *file;
   gchar **types;
-  gint i;
+  gsize i;
 
 #ifdef __APPLE__
   g_test_skip ("The OSX backend does not implement g_content_type_guess_for_tree()");
diff --git a/gio/tests/contexts.c b/gio/tests/contexts.c
index c6dc26111..3b64c7622 100644
--- a/gio/tests/contexts.c
+++ b/gio/tests/contexts.c
@@ -360,7 +360,8 @@ test_context_specific_emit (void)
 {
   GThread *threads[N_THREADS];
   gboolean exited = FALSE;
-  guint i, n;
+  gsize i;
+  gint k, n;
 
   for (i = 0; i < N_THREADS; i++)
     threads[i] = g_thread_new ("test", test_emit_thread, &observed_values[i]);
@@ -368,7 +369,7 @@ test_context_specific_emit (void)
   /* make changes and ensure that they are observed */
   for (n = 0; n < 1000; n++)
     {
-      guint64 expiry;
+      gint64 expiry;
 
       /* don't burn CPU forever */
       expiry = g_get_monotonic_time () + 10 * G_TIME_SPAN_SECOND;
@@ -376,7 +377,7 @@ test_context_specific_emit (void)
       g_atomic_int_set (&current_value, n);
 
       /* wake them to notice */
-      for (i = 0; i < g_test_rand_int_range (1, 5); i++)
+      for (k = 0; k < g_test_rand_int_range (1, 5); k++)
         g_context_specific_group_emit (&group, g_signal_lookup ("changed", per_thread_thing_get_type ()));
 
       for (i = 0; i < N_THREADS; i++)
diff --git a/gio/tests/converter-stream.c b/gio/tests/converter-stream.c
index 8bec95c76..45fb6a673 100644
--- a/gio/tests/converter-stream.c
+++ b/gio/tests/converter-stream.c
@@ -1207,7 +1207,7 @@ main (int   argc,
     { "/converter-input-stream/charset/fallbacks", "UTF-8", "Some characters just don't fit into latin1: πא", "ISO-8859-1", "Some characters just don't fit into latin1: \\CF\\80\\D7\\90", 4 },
   };
 
-  gint i;
+  gsize i;
 
   g_test_init (&argc, &argv, NULL);