diff --git a/ChangeLog b/ChangeLog
index 4959a1fd24..50aedbda84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2005-06-25  Wim Taymans  <wim@fluendo.com>
+
+	* check/states/sinks.c: (START_TEST), (gst_object_suite):
+	Have to check for completion now...
+
+2005-06-25  Wim Taymans  <wim@fluendo.com>
+
+	* gst/base/gstbasesink.c: (gst_basesink_preroll_queue_empty),
+	(gst_basesink_handle_object), (gst_basesink_event),
+	(gst_basesink_do_sync), (gst_basesink_handle_event),
+	(gst_basesink_change_state):
+	* gst/gstpad.h:
+	Unlock STREAM_LOCK whatever the recursion was.
+
 2005-06-25  Wim Taymans  <wim@fluendo.com>
 
 	* gst/base/gstbasesink.c: (gst_basesink_set_property),
diff --git a/check/states/sinks.c b/check/states/sinks.c
index 9ab6af7560..ed88eebc9d 100644
--- a/check/states/sinks.c
+++ b/check/states/sinks.c
@@ -67,6 +67,7 @@ START_TEST (test_src_sink)
   gst_object_unref (GST_OBJECT (sinkpad));
 
   ret = gst_element_set_state (pipeline, GST_STATE_PAUSED);
+  ret = gst_element_get_state (pipeline, NULL, NULL, NULL);
   fail_unless (ret == GST_STATE_SUCCESS, "no success state return");
 
   ret = gst_element_set_state (pipeline, GST_STATE_PLAYING);
diff --git a/tests/check/generic/sinks.c b/tests/check/generic/sinks.c
index 9ab6af7560..ed88eebc9d 100644
--- a/tests/check/generic/sinks.c
+++ b/tests/check/generic/sinks.c
@@ -67,6 +67,7 @@ START_TEST (test_src_sink)
   gst_object_unref (GST_OBJECT (sinkpad));
 
   ret = gst_element_set_state (pipeline, GST_STATE_PAUSED);
+  ret = gst_element_get_state (pipeline, NULL, NULL, NULL);
   fail_unless (ret == GST_STATE_SUCCESS, "no success state return");
 
   ret = gst_element_set_state (pipeline, GST_STATE_PLAYING);