diff --git a/gst/gstvalue.c b/gst/gstvalue.c
index 45c7599439..36bc610300 100644
--- a/gst/gstvalue.c
+++ b/gst/gstvalue.c
@@ -84,7 +84,7 @@ static char *
 gst_value_serialize_any_list (const GValue * value, const char *begin,
     const char *end)
 {
-  int i;
+  guint i;
   GArray *array = value->data[0].v_pointer;
   GString *s;
   GValue *v;
@@ -111,7 +111,7 @@ gst_value_transform_any_list_string (const GValue * src_value,
   GValue *list_value;
   GArray *array;
   GString *s;
-  int i;
+  guint i;
   char *list_s;
 
   array = src_value->data[0].v_pointer;
@@ -168,7 +168,7 @@ static GArray *
 gst_value_list_array_copy (const GArray * src)
 {
   GArray *dest;
-  gint i;
+  guint i;
 
   dest = g_array_sized_new (FALSE, TRUE, sizeof (GValue), src->len);
   g_array_set_size (dest, src->len);
@@ -190,7 +190,7 @@ gst_value_copy_list (const GValue * src_value, GValue * dest_value)
 static void
 gst_value_free_list (GValue * value)
 {
-  gint i;
+  guint i;
   GArray *src = (GArray *) value->data[0].v_pointer;
 
   if ((value->data[1].v_uint & G_VALUE_NOCOPY_CONTENTS) == 0) {
@@ -382,7 +382,7 @@ gst_value_transform_array_string (const GValue * src_value, GValue * dest_value)
 static int
 gst_value_compare_list (const GValue * value1, const GValue * value2)
 {
-  int i, j;
+  guint i, j;
   GArray *array1 = value1->data[0].v_pointer;
   GArray *array2 = value2->data[0].v_pointer;
   GValue *v1;
@@ -1780,7 +1780,8 @@ static gboolean
 gst_value_intersect_array (GValue * dest, const GValue * src1,
     const GValue * src2)
 {
-  gint size, n;
+  guint size;
+  guint n;
   GValue val = { 0 };
 
   /* only works on similar-sized arrays */
@@ -2077,7 +2078,7 @@ gboolean
 gst_value_can_compare (const GValue * value1, const GValue * value2)
 {
   GstValueTable *table;
-  int i;
+  guint i;
 
   if (G_VALUE_TYPE (value1) != G_VALUE_TYPE (value2))
     return FALSE;
@@ -2108,7 +2109,7 @@ int
 gst_value_compare (const GValue * value1, const GValue * value2)
 {
   GstValueTable *table, *best = NULL;
-  int i;
+  guint i;
 
   if (G_VALUE_TYPE (value1) != G_VALUE_TYPE (value2))
     return GST_VALUE_UNORDERED;
@@ -2155,7 +2156,7 @@ gboolean
 gst_value_can_union (const GValue * value1, const GValue * value2)
 {
   GstValueUnionInfo *union_info;
-  int i;
+  guint i;
 
   for (i = 0; i < gst_value_union_funcs->len; i++) {
     union_info = &g_array_index (gst_value_union_funcs, GstValueUnionInfo, i);
@@ -2184,7 +2185,7 @@ gboolean
 gst_value_union (GValue * dest, const GValue * value1, const GValue * value2)
 {
   GstValueUnionInfo *union_info;
-  int i;
+  guint i;
 
   for (i = 0; i < gst_value_union_funcs->len; i++) {
     union_info = &g_array_index (gst_value_union_funcs, GstValueUnionInfo, i);
@@ -2246,7 +2247,7 @@ gboolean
 gst_value_can_intersect (const GValue * value1, const GValue * value2)
 {
   GstValueIntersectInfo *intersect_info;
-  int i;
+  guint i;
 
   /* special cases */
   if (GST_VALUE_HOLDS_LIST (value1) || GST_VALUE_HOLDS_LIST (value2))
@@ -2284,8 +2285,8 @@ gst_value_intersect (GValue * dest, const GValue * value1,
     const GValue * value2)
 {
   GstValueIntersectInfo *intersect_info;
-  int i;
-  int ret = FALSE;
+  guint i;
+  gboolean ret = FALSE;
 
   /* special cases first */
   if (GST_VALUE_HOLDS_LIST (value1))
@@ -2371,7 +2372,7 @@ gst_value_subtract (GValue * dest, const GValue * minuend,
     const GValue * subtrahend)
 {
   GstValueSubtractInfo *info;
-  int i;
+  guint i;
 
   /* special cases first */
   if (GST_VALUE_HOLDS_LIST (minuend))
@@ -2422,7 +2423,7 @@ gboolean
 gst_value_can_subtract (const GValue * minuend, const GValue * subtrahend)
 {
   GstValueSubtractInfo *info;
-  int i;
+  guint i;
 
   /* special cases */
   if (GST_VALUE_HOLDS_LIST (minuend) || GST_VALUE_HOLDS_LIST (subtrahend))
@@ -2516,7 +2517,7 @@ gst_value_init_and_copy (GValue * dest, const GValue * src)
 gchar *
 gst_value_serialize (const GValue * value)
 {
-  int i;
+  guint i;
   GValue s_val = { 0 };
   GstValueTable *table, *best = NULL;
   char *s;
@@ -2564,7 +2565,7 @@ gboolean
 gst_value_deserialize (GValue * dest, const gchar * src)
 {
   GstValueTable *table, *best = NULL;
-  int i;
+  guint i;
 
   g_return_val_if_fail (src != NULL, FALSE);
   g_return_val_if_fail (G_IS_VALUE (dest), FALSE);