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/ext/flac/gstflacenc.c b/ext/flac/gstflacenc.c
index 49950ab7d7..eacedeb485 100644
--- a/ext/flac/gstflacenc.c
+++ b/ext/flac/gstflacenc.c
@@ -575,7 +575,7 @@ gst_flacenc_chain (GstPad *pad, GstData *_data)
     gst_flacenc_set_metadata (flacenc);
     state = FLAC__seekable_stream_encoder_init (flacenc->encoder);
     if (state != FLAC__STREAM_ENCODER_OK) {
-      GST_ELEMENT_ERROR (flacenc, LIBRARY, INIT, NULL,
+      GST_ELEMENT_ERROR (flacenc, LIBRARY, INIT, (NULL),
 		         ("could not initialize encoder (wrong parameters?)"));
       return;
     }
@@ -610,7 +610,7 @@ gst_flacenc_chain (GstPad *pad, GstData *_data)
   flacenc->data = NULL;
 
   if (!res) {
-    GST_ELEMENT_ERROR (flacenc, STREAM, ENCODE, NULL, NULL);
+    GST_ELEMENT_ERROR (flacenc, STREAM, ENCODE, (NULL), (NULL));
   }
 }