diff --git a/src/libsysprof/sysprof-perf-counter.c b/src/libsysprof/sysprof-perf-counter.c
index cb28207f..ef445d3a 100644
--- a/src/libsysprof/sysprof-perf-counter.c
+++ b/src/libsysprof/sysprof-perf-counter.c
@@ -293,12 +293,11 @@ static gboolean
 sysprof_perf_counter_dispatch (gpointer user_data)
 {
   SysprofPerfCounter *self = user_data;
-  guint i;
 
   g_assert (self != NULL);
   g_assert (self->info != NULL);
 
-  for (i = 0; i < self->info->len; i++)
+  for (guint i = 0; i < self->info->len; i++)
     {
       SysprofPerfCounterInfo *info = g_ptr_array_index (self->info, i);
 
diff --git a/src/libsysprof/sysprof-perf-source.c b/src/libsysprof/sysprof-perf-source.c
index 966d23d7..d478d8e9 100644
--- a/src/libsysprof/sysprof-perf-source.c
+++ b/src/libsysprof/sysprof-perf-source.c
@@ -592,8 +592,7 @@ sysprof_perf_source_start_pid (SysprofPerfSource  *self,
   gulong flags = 0;
   gint ncpu = g_get_num_processors ();
   gint cpu = 0;
-  gint fd;
-  gint i;
+  gint fd = -1;
 
   g_assert (SYSPROF_IS_PERF_SOURCE (self));
 
@@ -661,12 +660,10 @@ sysprof_perf_source_start_pid (SysprofPerfSource  *self,
             }
         }
 
-      for (i = 0; i < G_N_ELEMENTS(optional_tracepoints); i++)
-        {
-          sysprof_perf_source_add_optional_tracepoint (self, pid, cpu,
-                                                  &optional_tracepoints[i],
-                                                  error);
-        }
+      for (guint i = 0; i < G_N_ELEMENTS(optional_tracepoints); i++)
+        sysprof_perf_source_add_optional_tracepoint (self, pid, cpu,
+                                                     &optional_tracepoints[i],
+                                                     error);
     }
 
   return TRUE;