diff --git a/ChangeLog b/ChangeLog
index 14e457fa02..b8c9e5f7f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-12-30  Jan Schmidt  <thaytan@mad.scientist.com>
+
+	* ext/mad/gstid3tag.c: (gst_id3_tag_get_type):
+	  Remove lingering reference to GstID3Demux
+
+	* gst/mpegstream/gstmpegdemux.c: (gst_mpeg_demux_parse_pes):
+	  Don't output debug saying padding streams are unknown type,
+	  because they're not
+
 2005-12-27  Martin Soto  <martinsoto@users.sourceforge.net>
 
 	* gst/mpegstream/gstdvddemux.c (AUDIO_CAPS) 
diff --git a/ext/mad/gstid3tag.c b/ext/mad/gstid3tag.c
index 093429a027..0e4ed71536 100644
--- a/ext/mad/gstid3tag.c
+++ b/ext/mad/gstid3tag.c
@@ -181,12 +181,10 @@ static GstElementClass *parent_class = NULL;
 GType
 gst_id3_tag_get_type (guint type)
 {
-  static GType id3_tag_type[4] = { 0, 0, 0, 0 };
-  static gchar *name[4] = { "GstID3TagBase", "GstID3Demux", "GstID3Mux",
-    "GstID3Tag"
-  };
+  static GType id3_tag_type[3] = { 0, 0, 0 };
+  static gchar *name[3] = { "GstID3TagBase", "GstID3Mux", "GstID3Tag" };
 
-  g_assert (type < 4);
+  g_assert (type < 3);
 
   if (!id3_tag_type[type]) {
     GTypeInfo id3_tag_info = {
diff --git a/gst/mpegstream/gstmpegdemux.c b/gst/mpegstream/gstmpegdemux.c
index 772cebbee8..ceeb38454a 100644
--- a/gst/mpegstream/gstmpegdemux.c
+++ b/gst/mpegstream/gstmpegdemux.c
@@ -854,7 +854,7 @@ gst_mpeg_demux_parse_pes (GstMPEGParse * mpeg_parse, GstBuffer * buffer)
         id - 0xE0, GST_MPEG_DEMUX_VIDEO_MPEG, &mpeg_version);
     ret = CLASS (mpeg_demux)->send_subbuffer (mpeg_demux, outstream, buffer,
         timestamp, headerlen + 4, datalen);
-  } else {
+  } else if (id != 0xBE /* Ignore padding stream */ ) {
     GST_WARNING_OBJECT (mpeg_demux, "unknown stream id 0x%02x", id);
   }