diff --git a/ChangeLog b/ChangeLog
index 5a1f8d9da9..b98fe87019 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,16 +1,17 @@
 2005-10-12  Andy Wingo  <wingo@pobox.com>
 
-	* gst/gst.defs (gst_element_abort_preroll): foo
-	(gst_plugin_check_file): 
+	* gst/gst-extrafuncs.defs (flags, set_flag, unset_flag): Fix for
+	core updates.
 
-	* gst/gst.defs (gst_element_finish_preroll): foo
+	* gst/gstmodule.c (init_gst): Give a better error message.
+
+	* gst/gst.defs (gst_registry_scan_paths)
+	(gst_element_abort_preroll, gst_plugin_check_file)
+	(gst_element_finish_preroll): Removed undefined symbols.
 
 	* gst/gstelement.override (_wrap_gst_element_get_state): Fix for
 	GstClockTime api change.
 
-	* gst/gst.defs (gst_registry_scan_paths): Removed, following
-	removal from GStreamer.
-
 2005-10-12  Julien MOUTTE  <julien@moutte.net>
 
 	* gst/gst-argtypes.c:
diff --git a/gst/gst-extrafuncs.defs b/gst/gst-extrafuncs.defs
index 82d55e93dd..ce1b6d962d 100644
--- a/gst/gst-extrafuncs.defs
+++ b/gst/gst-extrafuncs.defs
@@ -2,13 +2,13 @@
 
 (define-method flags
   (of-object "GstElement")
-  (c-name "GST_FLAGS")
+  (c-name "GST_OBJECT_FLAGS")
   (return-type "GstElementFlags")
 )
 
 (define-method set_flag
   (of-object "GstObject")
-  (c-name "GST_FLAG_SET")
+  (c-name "GST_OBJECT_FLAG_SET")
   (return-type "none")
   (parameters
    '("GstObjectFlags" "flags")
@@ -17,7 +17,7 @@
 
 (define-method unset_flag
   (of-object "GstObject")
-  (c-name "GST_FLAG_UNSET")
+  (c-name "GST_OBJECT_FLAG_UNSET")
   (return-type "none")
   (parameters
    '("GstObjectFlags" "flag")
diff --git a/gst/gstmodule.c b/gst/gstmodule.c
index 6b33417f25..4480a60363 100644
--- a/gst/gstmodule.c
+++ b/gst/gstmodule.c
@@ -131,12 +131,17 @@ init_gst (void)
 	  argv[0] = g_strdup("");
      }
      if (!gst_init_check (&argc, &argv, &error)) {
+          gchar *errstr;
+          
 	  if (argv != NULL) {
 	       for (i = 0; i < argc; i++)
                     g_free (argv[i]);
 	       g_free (argv);
 	  }
-	  PyErr_SetString (PyExc_RuntimeError, "can't initialize module gst");
+          errstr = g_strdup_printf ("can't initialize module gst: %s",
+              GST_STR_NULL (error->message));
+	  PyErr_SetString (PyExc_RuntimeError, errstr);
+          g_free (errstr);
 	  g_error_free (error);
 	  setlocale(LC_NUMERIC, "C");
 	  return;