diff --git a/gst-libs/gst/audio/gstaudiodecoder.c b/gst-libs/gst/audio/gstaudiodecoder.c
index 8cfe6a30b4..cf130c690a 100644
--- a/gst-libs/gst/audio/gstaudiodecoder.c
+++ b/gst-libs/gst/audio/gstaudiodecoder.c
@@ -760,7 +760,7 @@ gst_audio_decoder_finish_frame (GstAudioDecoder * dec, GstBuffer * buf,
     priv->pending_events = NULL;
 
     GST_DEBUG_OBJECT (dec, "Pushing pending events");
-    for (l = priv->pending_events; l; l = l->next)
+    for (l = pending_events; l; l = l->next)
       gst_pad_push_event (dec->srcpad, l->data);
     g_list_free (pending_events);
   }
diff --git a/gst-libs/gst/audio/gstaudioencoder.c b/gst-libs/gst/audio/gstaudioencoder.c
index bb3d9ec8be..ad0fb8e563 100644
--- a/gst-libs/gst/audio/gstaudioencoder.c
+++ b/gst-libs/gst/audio/gstaudioencoder.c
@@ -1277,8 +1277,19 @@ gst_audio_encoder_sink_eventfunc (GstAudioEncoder * enc, GstEvent * event)
       gst_event_parse_tag (event, &tags);
       tags = gst_tag_list_copy (tags);
       gst_event_unref (event);
+
+      /* FIXME: make generic based on GST_TAG_FLAG_ENCODED */
       gst_tag_list_remove_tag (tags, GST_TAG_CODEC);
       gst_tag_list_remove_tag (tags, GST_TAG_AUDIO_CODEC);
+      gst_tag_list_remove_tag (tags, GST_TAG_VIDEO_CODEC);
+      gst_tag_list_remove_tag (tags, GST_TAG_SUBTITLE_CODEC);
+      gst_tag_list_remove_tag (tags, GST_TAG_CONTAINER_FORMAT);
+      gst_tag_list_remove_tag (tags, GST_TAG_BITRATE);
+      gst_tag_list_remove_tag (tags, GST_TAG_NOMINAL_BITRATE);
+      gst_tag_list_remove_tag (tags, GST_TAG_MAXIMUM_BITRATE);
+      gst_tag_list_remove_tag (tags, GST_TAG_MINIMUM_BITRATE);
+      gst_tag_list_remove_tag (tags, GST_TAG_ENCODER);
+      gst_tag_list_remove_tag (tags, GST_TAG_ENCODER_VERSION);
       event = gst_event_new_tag (tags);
 
       GST_AUDIO_ENCODER_STREAM_LOCK (enc);