diff --git a/gst/gstbuffer.c b/gst/gstbuffer.c
index dc7efebd39..635788a52b 100644
--- a/gst/gstbuffer.c
+++ b/gst/gstbuffer.c
@@ -73,7 +73,7 @@ void
 gst_buffer_print_stats (void)
 {
   g_log (g_log_domain_gstreamer, G_LOG_LEVEL_INFO, 
-		  "%d live buffers", _gst_buffer_live);
+		  "%d live buffer(s)", _gst_buffer_live);
 }
 
 /**
diff --git a/gst/gstevent.h b/gst/gstevent.h
index 1332d53fed..475b8a185e 100644
--- a/gst/gstevent.h
+++ b/gst/gstevent.h
@@ -68,6 +68,7 @@ typedef enum {
 
   GST_SEEK_FLAG_FLUSH		= (1 << (GST_SEEK_FLAGS_SHIFT + 0)),
   GST_SEEK_FLAG_ACCURATE	= (1 << (GST_SEEK_FLAGS_SHIFT + 1)),
+  GST_SEEK_FLAG_KEY_UNIT	= (1 << (GST_SEEK_FLAGS_SHIFT + 2)),
 } GstSeekType;
 
 typedef enum {
diff --git a/gst/gstpad.h b/gst/gstpad.h
index c1808c1b97..477af6aa42 100644
--- a/gst/gstpad.h
+++ b/gst/gstpad.h
@@ -131,10 +131,10 @@ typedef void 			(*GstPadChainFunction) 		(GstPad *pad,GstBuffer *buf);
 typedef GstBuffer*		(*GstPadGetFunction) 		(GstPad *pad);
 typedef gboolean		(*GstPadEventFunction)		(GstPad *pad, GstEvent *event);
 typedef gboolean		(*GstPadConvertFunction)	(GstPad *pad, 
-		 						 GstSeekType src_format,  gint64  src_value,
-								 GstSeekType *dest_format, gint64 *dest_value);
+		 						 GstFormat src_format,  gint64  src_value,
+								 GstFormat *dest_format, gint64 *dest_value);
 typedef gboolean		(*GstPadQueryFunction)		(GstPad *pad, GstPadQueryType type,
-		 						 GstSeekType *format, gint64  *value);
+		 						 GstFormat *format, gint64  *value);
 typedef GList*			(*GstPadIntConnFunction)	(GstPad *pad);
 
 typedef GstPadConnectReturn	(*GstPadConnectFunction) 	(GstPad *pad, GstCaps *caps);