diff --git a/ChangeLog b/ChangeLog
index 1727565513..d63ca88205 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-19  Andy Wingo  <wingo@pobox.com>
+
+	* gst/parse/parse.l: Attempt to solve bug #172815.
+
 2005-07-19  Wim Taymans  <wim@fluendo.com>
 
 	* docs/design/part-clocks.txt:
diff --git a/docs/gst/tmpl/gstelement.sgml b/docs/gst/tmpl/gstelement.sgml
index a474d062d6..489dc9638c 100644
--- a/docs/gst/tmpl/gstelement.sgml
+++ b/docs/gst/tmpl/gstelement.sgml
@@ -80,9 +80,7 @@ and gst_element_set_clock().  You can wait for the clock to reach a given
 @final_state: 
 @state_error: 
 @no_preroll: 
-@manager: 
 @bus: 
-@scheduler: 
 @clock: 
 @base_time: 
 @numpads: 
@@ -140,9 +138,7 @@ and gst_element_set_clock().  You can wait for the clock to reach a given
 @release_pad: 
 @get_state: 
 @change_state: 
-@set_manager: 
 @set_bus: 
-@set_scheduler: 
 @get_clock: 
 @set_clock: 
 @get_index: 
@@ -256,8 +252,6 @@ A helper macro to create a mask function
 This enum defines the standard flags that an element may have.
 </para>
 
-@GST_ELEMENT_SCHEDULER_PRIVATE1: 
-@GST_ELEMENT_SCHEDULER_PRIVATE2: 
 @GST_ELEMENT_LOCKED_STATE: 
 @GST_ELEMENT_IS_SINK: 
 @GST_ELEMENT_FLAG_LAST: 
@@ -438,26 +432,6 @@ Sets the parent of an element.
 @Returns: 
 
 
-<!-- ##### FUNCTION gst_element_set_scheduler ##### -->
-<para>
-
-</para>
-
-@element: 
-@scheduler: 
-<!-- # Unused Parameters # -->
-@sched: 
-
-
-<!-- ##### FUNCTION gst_element_get_scheduler ##### -->
-<para>
-
-</para>
-
-@element: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gst_element_add_pad ##### -->
 <para>
 
@@ -716,15 +690,6 @@ Sets the parent of an element.
 @Returns: 
 
 
-<!-- ##### FUNCTION gst_element_get_manager ##### -->
-<para>
-
-</para>
-
-@element: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gst_element_no_more_pads ##### -->
 <para>
 
diff --git a/docs/gst/tmpl/gsterror.sgml b/docs/gst/tmpl/gsterror.sgml
index 7dd7e26d8e..3b972c33b0 100644
--- a/docs/gst/tmpl/gsterror.sgml
+++ b/docs/gst/tmpl/gsterror.sgml
@@ -28,7 +28,6 @@ Categorized error messages
 @GST_CORE_ERROR_STATE_CHANGE: 
 @GST_CORE_ERROR_PAD: 
 @GST_CORE_ERROR_THREAD: 
-@GST_CORE_ERROR_SCHEDULER: 
 @GST_CORE_ERROR_NEGOTIATION: 
 @GST_CORE_ERROR_EVENT: 
 @GST_CORE_ERROR_SEEK: 
diff --git a/docs/gst/tmpl/gstpad.sgml b/docs/gst/tmpl/gstpad.sgml
index 45bdc5e9b1..eb933fdd43 100644
--- a/docs/gst/tmpl/gstpad.sgml
+++ b/docs/gst/tmpl/gstpad.sgml
@@ -491,7 +491,7 @@ Checks if the pad is a sink pad.
 @Returns: 
 
 
-<!-- ##### FUNCTION gst_pad_get_parent ##### -->
+<!-- ##### MACRO gst_pad_get_parent ##### -->
 <para>
 
 </para>
diff --git a/docs/gst/tmpl/gstscheduler.sgml b/docs/gst/tmpl/gstscheduler.sgml
index 2be2185385..202f74522a 100644
--- a/docs/gst/tmpl/gstscheduler.sgml
+++ b/docs/gst/tmpl/gstscheduler.sgml
@@ -17,56 +17,3 @@ This is a base class for custom schedulers.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### STRUCT GstScheduler ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ENUM GstSchedulerFlags ##### -->
-<para>
-Flags for the scheduler
-</para>
-
-@GST_SCHEDULER_FLAG_LAST: subclasses can start numbering their flags starting
-                          from here.
-
-<!-- ##### MACRO GST_SCHEDULER_PARENT ##### -->
-<para>
-Get the parent object of this scheduler.
-</para>
-
-@sched: the scheduler to get the parent of.
-
-
-<!-- ##### MACRO GST_SCHEDULER_STATE ##### -->
-<para>
-Get the state of the scheduler.
-</para>
-
-@sched: the scheduler to get the state of.
-
-
-<!-- ##### FUNCTION gst_scheduler_setup ##### -->
-<para>
-
-</para>
-
-@sched: 
-
-
-<!-- ##### FUNCTION gst_scheduler_reset ##### -->
-<para>
-
-</para>
-
-@sched: 
-
-
-<!-- ##### MACRO GST_SCHEDULER_DEFAULT_NAME ##### -->
-<para>
-
-</para>
-
-
-
diff --git a/docs/gst/tmpl/gstschedulerfactory.sgml b/docs/gst/tmpl/gstschedulerfactory.sgml
index bda06b070d..cb3f37a3b6 100644
--- a/docs/gst/tmpl/gstschedulerfactory.sgml
+++ b/docs/gst/tmpl/gstschedulerfactory.sgml
@@ -34,85 +34,3 @@ Use gst_scheduler_factory_destroy() to remove the factory from the global list.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### STRUCT GstSchedulerFactory ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION gst_scheduler_register ##### -->
-<para>
-
-</para>
-
-@plugin: 
-@name: 
-@longdesc: 
-@type: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gst_scheduler_factory_new ##### -->
-<para>
-
-</para>
-
-@name: 
-@longdesc: 
-@type: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gst_scheduler_factory_destroy ##### -->
-<para>
-
-</para>
-
-@factory: 
-
-
-<!-- ##### FUNCTION gst_scheduler_factory_find ##### -->
-<para>
-
-</para>
-
-@name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gst_scheduler_factory_create ##### -->
-<para>
-
-</para>
-
-@factory: 
-@parent: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gst_scheduler_factory_make ##### -->
-<para>
-
-</para>
-
-@name: 
-@parent: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gst_scheduler_factory_set_default_name ##### -->
-<para>
-
-</para>
-
-@name: 
-
-
-<!-- ##### FUNCTION gst_scheduler_factory_get_default_name ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
diff --git a/gst/parse/parse.l b/gst/parse/parse.l
index dc3e4fe8f8..f47f1d3ac6 100644
--- a/gst/parse/parse.l
+++ b/gst/parse/parse.l
@@ -2,6 +2,8 @@
 #include <math.h>
 #include <string.h>
 
+#include <glib/gprintf.h>
+
 #include "../gst_private.h"
 
 #include "types.h"
@@ -9,6 +11,10 @@
 #include "../gsturi.h"
 #include "grammar.tab.h"
 
+/* Override the default ECHO so as to avoid fortify warnings. Ignore the
+   embedded-NUL case for now. We know yytext is NUL-terminated. */
+#define ECHO g_fprintf(yyout, "%s", yytext)
+
 #ifdef G_HAVE_ISO_VARARGS
 #define PRINT(...) GST_CAT_DEBUG (GST_CAT_PIPELINE, "flex: " __VA_ARGS__)
 #elif defined(G_HAVE_GNUC_VARARGS)