diff --git a/ChangeLog b/ChangeLog
index 269d5ce288..a145684aa3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-10-12  Wim Taymans  <wim@fluendo.com>
+
+	* gst-libs/gst/audio/gstringbuffer.c: (gst_ring_buffer_commit),
+	(gst_ring_buffer_read), (gst_ring_buffer_clear):
+	Don't assert on normal stuff.
+
+	* gst/playback/gstplaybin.c: (do_playbin_seek):
+	API fix.
+
 2005-10-12  Wim Taymans  <wim@fluendo.com>
 
 	* check/pipelines/simple_launch_lines.c: (run_pipeline):
diff --git a/gst-libs/gst/audio/gstringbuffer.c b/gst-libs/gst/audio/gstringbuffer.c
index 274d326578..6aa866c269 100644
--- a/gst-libs/gst/audio/gstringbuffer.c
+++ b/gst-libs/gst/audio/gstringbuffer.c
@@ -1204,7 +1204,10 @@ gst_ring_buffer_clear (GstRingBuffer * buf, gint segment)
   guint8 *data;
 
   g_return_if_fail (buf != NULL);
-  g_return_if_fail (buf->data != NULL);
+  /* no data means it's allready cleared */
+  if (buf->data == NULL)
+    return;
+
   g_return_if_fail (buf->empty_seg != NULL);
 
   data = GST_BUFFER_DATA (buf->data);
diff --git a/gst/playback/gstplaybin.c b/gst/playback/gstplaybin.c
index aa489d8bbf..ea3c9a5c89 100644
--- a/gst/playback/gstplaybin.c
+++ b/gst/playback/gstplaybin.c
@@ -897,12 +897,10 @@ do_playbin_seek (GstElement * element, GstEvent * event)
 
   if (flush) {
     GstState state;
-    GTimeVal timeout;
 
-    GST_TIME_TO_TIMEVAL (0, timeout);
     /* need to call _get_state() since a bin state is only updated
      * with this call. */
-    gst_element_get_state (element, &state, NULL, &timeout);
+    gst_element_get_state (element, &state, NULL, 0);
     was_playing = state == GST_STATE_PLAYING;
 
     if (was_playing) {