diff --git a/ChangeLog b/ChangeLog
index 951d2d2118..8a067ce615 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-11-17  Torsten Schoenfeld  <kaffeetisch at gmx dot net>
+
+	Reviewed by: Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst/gstmessage.c: (gst_message_parse_clock_lost):
+	  Assertion should check for CLOCK_LOST, not NEW_CLOCK (#321648).
+
+	* gst/gstpadtemplate.h:
+	* gst/gstpluginfeature.h:
+	  Don't use c++ style comments in headers (#321638).
+
 2005-11-16  Andy Wingo  <wingo@pobox.com>
 
 	* gst/net/gstnettimepacket.c (gst_net_time_packet_send): Free
diff --git a/gst/gstmessage.c b/gst/gstmessage.c
index 0877c8b4bf..0c87af0115 100644
--- a/gst/gstmessage.c
+++ b/gst/gstmessage.c
@@ -770,7 +770,7 @@ gst_message_parse_clock_lost (GstMessage * message, GstClock ** clock)
   const GValue *clock_gvalue;
 
   g_return_if_fail (GST_IS_MESSAGE (message));
-  g_return_if_fail (GST_MESSAGE_TYPE (message) == GST_MESSAGE_NEW_CLOCK);
+  g_return_if_fail (GST_MESSAGE_TYPE (message) == GST_MESSAGE_CLOCK_LOST);
 
   clock_gvalue = gst_structure_get_value (message->structure, "clock");
   g_return_if_fail (clock_gvalue != NULL);
diff --git a/gst/gstpadtemplate.h b/gst/gstpadtemplate.h
index f03d636489..d4c9d49ec3 100644
--- a/gst/gstpadtemplate.h
+++ b/gst/gstpadtemplate.h
@@ -36,7 +36,7 @@
 G_BEGIN_DECLS
 
 /* FIXME: this awful circular dependency need to be resolved properly (see pad.h) */
-//typedef struct _GstPadTemplate GstPadTemplate;
+/*typedef struct _GstPadTemplate GstPadTemplate; */
 typedef struct _GstPadTemplateClass GstPadTemplateClass;
 typedef struct _GstStaticPadTemplate GstStaticPadTemplate;
 
diff --git a/gst/gstpluginfeature.h b/gst/gstpluginfeature.h
index d3c339f9bc..dfc6143ed2 100644
--- a/gst/gstpluginfeature.h
+++ b/gst/gstpluginfeature.h
@@ -77,7 +77,7 @@ struct _GstPluginFeature {
   gchar 	*name;
   guint   	 rank;
 
-  //struct _GstPlugin     *plugin;
+  /* struct _GstPlugin     *plugin; */
   gchar *plugin_name;
 
   /*< private >*/