diff --git a/ChangeLog b/ChangeLog
index 2390e54612..62c582a6f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2005-12-27  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst/gst.c: (init_post):
+	  Init tags stuff and some other things before loading
+	  any static plugins (there may be other static plugins
+	  than just the GStreamer ones, and they may want to
+	  register their own tags or formats or whatever, and
+	  preferably without segfaulting).
+
+	* plugins/elements/gstqueue.c: (gst_queue_handle_src_query):
+	  Print at least a warning in the debug logs if we drop a
+	  query just because we don't know how to adjust the value
+	  in the particular format.
+
 2005-12-24  David Schleef  <ds@schleef.org>
 
 	* tools/gstreamer-completion:
diff --git a/gst/gst.c b/gst/gst.c
index 9c817e7854..4abda14afd 100644
--- a/gst/gst.c
+++ b/gst/gst.c
@@ -567,18 +567,19 @@ init_post (void)
   gst_uri_handler_get_type ();
 #endif /* GST_DISABLE_URI */
 
-  /* register core plugins */
-  _gst_plugin_register_static (&plugin_desc);
-
   gst_structure_get_type ();
   _gst_value_initialize ();
   gst_caps_get_type ();
-  _gst_plugin_initialize ();
   _gst_event_initialize ();
   _gst_buffer_initialize ();
   _gst_message_initialize ();
   _gst_tag_initialize ();
 
+  /* register core plugins */
+  _gst_plugin_register_static (&plugin_desc);
+
+  _gst_plugin_initialize ();
+
 #ifndef GST_DISABLE_REGISTRY
   {
     char *registry_file;
diff --git a/plugins/elements/gstqueue.c b/plugins/elements/gstqueue.c
index 91b071300e..8f527ebbbe 100644
--- a/plugins/elements/gstqueue.c
+++ b/plugins/elements/gstqueue.c
@@ -917,6 +917,8 @@ gst_queue_handle_src_query (GstPad * pad, GstQuery * query)
           peer_pos -= queue->cur_level.time;
           break;
         default:
+          GST_WARNING_OBJECT (queue, "dropping query in %s format, don't "
+              "know how to adjust value", gst_format_get_name (format));
           return FALSE;
       }
       /* set updated position */