diff --git a/ChangeLog b/ChangeLog
index be93fc132c..e2905a4aa5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-11-09  Stefan Kost  <ensonic@users.sf.net>
+
+	* sys/xvimage/xvimagesink.c: (gst_xvimagesink_change_state):
+	  clear xv when going to NULL, remove // commented non-existant proto
+
+	* tests/examples/seek/seek.c: (main):
+	  add missing tooltip description for scrub and play_scrub
+
 2006-11-14  David Schleef  <ds@schleef.org>
 
 	* configure.ac:
diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c
index 84205f6eac..aa6b3c7c39 100644
--- a/sys/xvimage/xvimagesink.c
+++ b/sys/xvimage/xvimagesink.c
@@ -156,8 +156,6 @@ static gint gst_xvimagesink_get_format_from_caps (GstXvImageSink * xvimagesink,
     GstCaps * caps);
 static void gst_xvimagesink_expose (GstXOverlay * overlay);
 
-//static void gst_xvimagesink_send_pending_navigation (GstXvImageSink * xvimagesink);
-
 /* ElementFactory information */
 static const GstElementDetails gst_xvimagesink_details =
 GST_ELEMENT_DETAILS ("Video sink",
@@ -1972,6 +1970,7 @@ gst_xvimagesink_change_state (GstElement * element, GstStateChange transition)
       gst_xvimagesink_imagepool_clear (xvimagesink);
 
       if (xvimagesink->xwindow) {
+        gst_xvimagesink_xwindow_clear (xvimagesink, xvimagesink->xwindow);
         gst_xvimagesink_xwindow_destroy (xvimagesink, xvimagesink->xwindow);
         xvimagesink->xwindow = NULL;
       }
diff --git a/tests/examples/seek/seek.c b/tests/examples/seek/seek.c
index f1242d9bbc..fb23ee53d4 100644
--- a/tests/examples/seek/seek.c
+++ b/tests/examples/seek/seek.c
@@ -1507,8 +1507,10 @@ main (int argc, char **argv)
   gtk_tooltips_set_tip (tips, rate_spinbutton, "define the playback rate, "
       "negative value trigger reverse playback", NULL);
   /* FIXME: describe these */
-  gtk_tooltips_set_tip (tips, scrub_checkbox, "???", NULL);
-  gtk_tooltips_set_tip (tips, play_scrub_checkbox, "???", NULL);
+  gtk_tooltips_set_tip (tips, scrub_checkbox, "show images while seeking",
+      NULL);
+  gtk_tooltips_set_tip (tips, play_scrub_checkbox, "play video while seeking",
+      NULL);
 
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (flush_checkbox), TRUE);
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (scrub_checkbox), TRUE);