diff --git a/gst/autoplug/autoplugtest.c b/gst/autoplug/autoplugtest.c
index 748175ffd2..a3c60d1e8a 100644
--- a/gst/autoplug/autoplugtest.c
+++ b/gst/autoplug/autoplugtest.c
@@ -63,7 +63,6 @@ void have_type(GstElement *element, GstCaps *caps, GstCaps **private_caps) {
 
 int main (int argc,char *argv[]) {
   GstCaps *caps;
-  int i;
 
   gst_init(&argc,&argv);
 
diff --git a/gst/autoplug/gststaticautoplugrender.c b/gst/autoplug/gststaticautoplugrender.c
index cbfc798fa1..05bbea70a4 100644
--- a/gst/autoplug/gststaticautoplugrender.c
+++ b/gst/autoplug/gststaticautoplugrender.c
@@ -242,6 +242,8 @@ gst_autoplug_caps_find_cost (gpointer src, gpointer dest, gpointer data)
   }
   else {
     res = gst_autoplug_can_match ((GstElementFactory *)src, (GstElementFactory *)dest);
+    //GST_INFO (GST_CAT_AUTOPLUG_ATTEMPT,"factory %s to factory %s %d", 
+//		    ((GstElementFactory *)src)->name, ((GstElementFactory *)dest)->name, res);
   }
 
   if (res)
diff --git a/gst/gstbin.c b/gst/gstbin.c
index 1a61097b72..d2747a0975 100644
--- a/gst/gstbin.c
+++ b/gst/gstbin.c
@@ -671,7 +671,7 @@ gst_bin_iterate (GstBin *bin)
 }
 
 /* out internal element fired EOS, we decrement the number of pending EOS childs */
-static void
+G_GNUC_UNUSED static void
 gst_bin_received_eos (GstElement *element, GstBin *bin)
 {
   GST_INFO_ELEMENT (GST_CAT_PLANNING, bin, "child %s fired eos, pending %d", GST_ELEMENT_NAME (element),
diff --git a/gst/gstpad.c b/gst/gstpad.c
index c3e1ce71ff..0fff58029b 100644
--- a/gst/gstpad.c
+++ b/gst/gstpad.c
@@ -1304,7 +1304,7 @@ gst_pad_renegotiate (GstPad *pad)
     GST_DEBUG (GST_CAT_NEGOTIATION, "pads aggreed on caps :)\n");
 
   newcaps = GST_PAD_CAPS (pad);
-    g_return_val_if_fail(newcaps != NULL, FALSE);	// FIXME is this valid?
+    //g_return_val_if_fail(newcaps != NULL, FALSE);	// FIXME is this valid?
 
     /* here we have some sort of aggreement of the caps */
     GST_PAD_CAPS (currentpad) = gst_caps_ref (newcaps);
diff --git a/gst/gstqueue.c b/gst/gstqueue.c
index 755c8f8c2e..944b9debed 100644
--- a/gst/gstqueue.c
+++ b/gst/gstqueue.c
@@ -198,9 +198,6 @@ gst_queue_handle_negotiate_src (GstPad *pad, GstCaps **caps, gpointer *data)
   queue = GST_QUEUE (GST_OBJECT_PARENT (pad));
 
   return gst_pad_negotiate_proxy (pad, queue->sinkpad, caps);
-  
-
-  //return GST_PAD_NEGOTIATE_FAIL;
 }
 
 static GstPadNegotiateReturn
@@ -210,19 +207,7 @@ gst_queue_handle_negotiate_sink (GstPad *pad, GstCaps **caps, gpointer *data)
 
   queue = GST_QUEUE (GST_OBJECT_PARENT (pad));
 
-  /*
-  if (counter == 0) {
-     *caps = NULL;
-     return GST_PAD_NEGOTIATE_TRY;
-  }
-  if (*caps) {
-  */
-    return gst_pad_negotiate_proxy (pad, queue->srcpad, caps);
-    /*
-  }
-
-  return GST_PAD_NEGOTIATE_FAIL;
-  */
+  return gst_pad_negotiate_proxy (pad, queue->srcpad, caps);
 }
 
 static gboolean
@@ -271,7 +256,6 @@ static void
 gst_queue_chain (GstPad *pad, GstBuffer *buf)
 {
   GstQueue *queue;
-  gboolean tosignal = FALSE;
   const guchar *name;
 
   g_return_if_fail (pad != NULL);
diff --git a/gst/gstscheduler.c b/gst/gstscheduler.c
index 44392d9847..9a3e3f1348 100644
--- a/gst/gstscheduler.c
+++ b/gst/gstscheduler.c
@@ -314,7 +314,7 @@ gst_schedule_cothreaded_chain (GstBin *bin, GstScheduleChain *chain) {
   }
 }
 
-static void
+G_GNUC_UNUSED static void
 gst_schedule_chained_chain (GstBin *bin, _GstBinChain *chain) {
   GList *elements;
   GstElement *element;
diff --git a/plugins/elements/gstqueue.c b/plugins/elements/gstqueue.c
index 755c8f8c2e..944b9debed 100644
--- a/plugins/elements/gstqueue.c
+++ b/plugins/elements/gstqueue.c
@@ -198,9 +198,6 @@ gst_queue_handle_negotiate_src (GstPad *pad, GstCaps **caps, gpointer *data)
   queue = GST_QUEUE (GST_OBJECT_PARENT (pad));
 
   return gst_pad_negotiate_proxy (pad, queue->sinkpad, caps);
-  
-
-  //return GST_PAD_NEGOTIATE_FAIL;
 }
 
 static GstPadNegotiateReturn
@@ -210,19 +207,7 @@ gst_queue_handle_negotiate_sink (GstPad *pad, GstCaps **caps, gpointer *data)
 
   queue = GST_QUEUE (GST_OBJECT_PARENT (pad));
 
-  /*
-  if (counter == 0) {
-     *caps = NULL;
-     return GST_PAD_NEGOTIATE_TRY;
-  }
-  if (*caps) {
-  */
-    return gst_pad_negotiate_proxy (pad, queue->srcpad, caps);
-    /*
-  }
-
-  return GST_PAD_NEGOTIATE_FAIL;
-  */
+  return gst_pad_negotiate_proxy (pad, queue->srcpad, caps);
 }
 
 static gboolean
@@ -271,7 +256,6 @@ static void
 gst_queue_chain (GstPad *pad, GstBuffer *buf)
 {
   GstQueue *queue;
-  gboolean tosignal = FALSE;
   const guchar *name;
 
   g_return_if_fail (pad != NULL);