diff --git a/ChangeLog b/ChangeLog
index ead95afa78..d35fe370dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2004-02-22  Benjamin Otte  <otte@gnome.org>
+
+	reported by: Stefan Kost <kost@imn.htwk-leipzig.de>
+
+	* gst/audioconvert/gstaudioconvert.c: (plugin_init):
+	  set rank to PRIMARY
+	* gst/volume/gstvolume.c: (plugin_init):
+	  set rank to NONE
+	fixes #134960
+
+2004-02-22   Julio M. Merino Vidal <jmmv@menta.net>
+
+	reviewed by Benjamin Otte  <otte@gnome.org>
+
+	* ext/flac/gstflacenc.c: (gst_flacenc_chain):
+	  escape NULL strings in GST_ELEMENT_ERROR properly (fixes #135116)
+
 2004-02-22  Benjamin Otte  <otte@gnome.org>
 
 	* configure.ac:
diff --git a/common b/common
index d821172609..0945c85c4c 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit d821172609916bc61bbbca7f8d2e6cf0ca1ab47a
+Subproject commit 0945c85c4c9139e2e5b8e04d0fc841b8aa1e6e9b
diff --git a/gst/audioconvert/gstaudioconvert.c b/gst/audioconvert/gstaudioconvert.c
index 4624b7c19e..41faf577a8 100644
--- a/gst/audioconvert/gstaudioconvert.c
+++ b/gst/audioconvert/gstaudioconvert.c
@@ -785,7 +785,7 @@ gst_audio_convert_channels (GstAudioConvert *this, GstBuffer *buf)
 static gboolean
 plugin_init (GstPlugin *plugin)
 {
-  if (!gst_element_register (plugin, "audioconvert", GST_RANK_NONE, GST_TYPE_AUDIO_CONVERT))
+  if (!gst_element_register (plugin, "audioconvert", GST_RANK_PRIMARY, GST_TYPE_AUDIO_CONVERT))
     return FALSE;
 
   return TRUE;
diff --git a/gst/volume/gstvolume.c b/gst/volume/gstvolume.c
index 137517fa04..dbc6d8dd5b 100644
--- a/gst/volume/gstvolume.c
+++ b/gst/volume/gstvolume.c
@@ -591,7 +591,7 @@ plugin_init (GstPlugin *plugin)
 {
   gst_control_init(NULL,NULL);
   
-  return gst_element_register (plugin, "volume", GST_RANK_PRIMARY, GST_TYPE_VOLUME);
+  return gst_element_register (plugin, "volume", GST_RANK_NONE, GST_TYPE_VOLUME);
 }
 
 GST_PLUGIN_DEFINE (