diff --git a/src/shell-app.c b/src/shell-app.c
index c33807faa..2fb6cfda2 100644
--- a/src/shell-app.c
+++ b/src/shell-app.c
@@ -699,7 +699,7 @@ static int
 shell_app_get_last_user_time (ShellApp *app)
 {
   GSList *iter;
-  int last_user_time;
+  guint32 last_user_time;
 
   last_user_time = 0;
 
@@ -709,7 +709,7 @@ shell_app_get_last_user_time (ShellApp *app)
         last_user_time = MAX (last_user_time, meta_window_get_user_time (iter->data));
     }
 
-  return last_user_time;
+  return (int)last_user_time;
 }
 
 /**
diff --git a/src/shell-perf-log.c b/src/shell-perf-log.c
index ab78deddc..3c68a77d0 100644
--- a/src/shell-perf-log.c
+++ b/src/shell-perf-log.c
@@ -626,7 +626,7 @@ shell_perf_log_collect_statistics (ShellPerfLog *perf_log)
 {
   gint64 event_time = get_time ();
   gint64 collection_time;
-  int i;
+  guint i;
 
   if (!perf_log->enabled)
     return;
@@ -819,7 +819,7 @@ shell_perf_log_dump_events (ShellPerfLog   *perf_log,
                             GError        **error)
 {
   GString *output;
-  int i;
+  guint i;
 
   output = g_string_new (NULL);
   g_string_append (output, "[ ");
diff --git a/src/shell-util.c b/src/shell-util.c
index e5447c250..33de0200f 100644
--- a/src/shell-util.c
+++ b/src/shell-util.c
@@ -84,7 +84,7 @@ shell_util_get_transformed_allocation (ClutterActor    *actor,
    */
   ClutterVertex v[4];
   gfloat x_min, x_max, y_min, y_max;
-  gint i;
+  guint i;
 
   g_return_if_fail (CLUTTER_IS_ACTOR (actor));