diff --git a/ChangeLog b/ChangeLog
index 142d2160e9..9b5f334ca1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-04-04  Benjamin Otte  <otte@gnome.org>
+
+	* gst/gstpad.c: (gst_pad_collect_valist):
+	  fix uninitialized variable warning
+	* gst/schedulers/entryscheduler.c: (schedule_forward):
+	  fix shadowed variable
+
 2004-04-04  Benjamin Otte  <otte@gnome.org>
 
 	* gst/gstpad.c: (gst_pad_collect_array), (gst_pad_collectv),
diff --git a/gst/gstpad.c b/gst/gstpad.c
index 5ef905958b..2bb01c8461 100644
--- a/gst/gstpad.c
+++ b/gst/gstpad.c
@@ -3219,16 +3219,13 @@ gst_pad_collect_valist (GstPad ** selected, GstPad * pad, va_list var_args)
 
   g_return_val_if_fail (GST_IS_PAD (pad), NULL);
 
+  element = gst_pad_get_parent (pad);
+  maxlength = element->numsinkpads;
+  /* can we make this list a bit smaller than this upper limit? */
+  padlist = g_alloca (sizeof (gpointer) * (maxlength + 1));
   while (pad) {
     g_return_val_if_fail (i < maxlength, NULL);
-    if (element) {
-      g_return_val_if_fail (element == gst_pad_get_parent (pad), NULL);
-    } else {
-      element = gst_pad_get_parent (pad);
-      maxlength = element->numsinkpads;
-      /* can we make this list a bit smaller than this upper limit? */
-      padlist = g_alloca (sizeof (gpointer) * (maxlength + 1));
-    }
+    g_return_val_if_fail (element == gst_pad_get_parent (pad), NULL);
     padlist[i++] = pad;
     pad = va_arg (var_args, GstPad *);
   }
diff --git a/gst/schedulers/entryscheduler.c b/gst/schedulers/entryscheduler.c
index bf3095d3d5..0156af3eee 100644
--- a/gst/schedulers/entryscheduler.c
+++ b/gst/schedulers/entryscheduler.c
@@ -626,7 +626,6 @@ schedule_forward (Entry * entry)
     return schedule_forward ((Entry *) ((LinkPrivate *) entry)->sink);
   } else if (ENTRY_IS_COTHREAD (entry)) {
     GList *list;
-    Entry *entry;
     GstElement *element = ((CothreadPrivate *) entry)->element;
 
     if (GST_FLAG_IS_SET (element, GST_ELEMENT_DECOUPLED))