diff --git a/ext/dvdread/dvdsrc.c b/ext/dvdread/dvdsrc.c
index 996782a66f..372c13d9a0 100644
--- a/ext/dvdread/dvdsrc.c
+++ b/ext/dvdread/dvdsrc.c
@@ -472,14 +472,6 @@ dvdsrc_loop (GstElement *element)
 
           g_return_if_fail (GST_BUFFER_DATA (buf) != NULL);
 
-          /*
-          if (priv->new_seek) {
-            _seek(priv, priv->titleid, priv->chapid, priv->angle);
-            GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLUSH);
-            priv->new_seek = FALSE;
-          }
-          */
-
           /**
            * Read NAV packet.
            */
@@ -697,7 +689,6 @@ dvdsrc_get (GstPad *pad)
 
   if (priv->new_seek) {
     _seek(priv, priv->titleid, priv->chapid, priv->angle);
-    GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLUSH);
   }
 
   /* read it in from the file */
diff --git a/ext/sidplay/gstsiddec.cc b/ext/sidplay/gstsiddec.cc
index 85bd29d863..dd6d9f0108 100644
--- a/ext/sidplay/gstsiddec.cc
+++ b/ext/sidplay/gstsiddec.cc
@@ -357,7 +357,7 @@ gst_siddec_loop (GstElement *element)
 	  break;
 	default:
 	  // bail out, we're not going to do anything
-	  gst_element_set_state (element, GST_STATE_PAUSED);
+	  gst_element_set_eos (element);
 	  gst_pad_send_event (siddec->srcpad, gst_event_new (GST_EVENT_EOS));
 	  break;
       }
diff --git a/gst/mpegaudioparse/gstmpegaudioparse.c b/gst/mpegaudioparse/gstmpegaudioparse.c
index f8ece389a3..220d6dd2e3 100644
--- a/gst/mpegaudioparse/gstmpegaudioparse.c
+++ b/gst/mpegaudioparse/gstmpegaudioparse.c
@@ -247,13 +247,14 @@ gst_mp3parse_chain (GstPad *pad, GstBuffer *buf)
 
   last_ts = GST_BUFFER_TIMESTAMP(buf);
 
-  if (GST_BUFFER_FLAG_IS_SET(buf, GST_BUFFER_FLUSH)) {
+  /* FIXME, do flush */
+  /*
     if (mp3parse->partialbuf) {
       gst_buffer_unref(mp3parse->partialbuf);
       mp3parse->partialbuf = NULL;
     }
     mp3parse->in_flush = TRUE;
-  }
+    */
 
   // if we have something left from the previous frame
   if (mp3parse->partialbuf) {
@@ -329,12 +330,9 @@ gst_mp3parse_chain (GstPad *pad, GstBuffer *buf)
 	if (mp3parse->skip == 0) {
           GST_DEBUG (0,"mp3parse: pushing buffer of %d bytes\n",GST_BUFFER_SIZE(outbuf));
 	  if (mp3parse->in_flush) {
-	    GST_BUFFER_FLAG_SET(outbuf, GST_BUFFER_FLUSH);
+	    /* FIXME do some sort of flush event */
 	    mp3parse->in_flush = FALSE;
 	  }
-	  else {
-	    GST_BUFFER_FLAG_UNSET(outbuf, GST_BUFFER_FLUSH);
-	  }
 	  GST_BUFFER_TIMESTAMP(outbuf) = last_ts;
           gst_pad_push(mp3parse->srcpad,outbuf);
 	}