diff --git a/ChangeLog b/ChangeLog
index de9cf1bf3..16e95d4ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2001-08-27  Yoann Vandoorselaere  <yoann@mandrakesoft.com>
+
+	* src/nautilus-switchable-search-bar.c (nautilus_switchable_search_bar_new): 
+	Don't leak a GtkBox.
+
+	* src/nautilus-complex-search-bar.c (load_find_them_pixmap_widget): 
+	Do not check pixmap, check pixbuf. This also fix a leak.
+
+	* libnautilus-private/nautilus-link.c (local_set_root_property): 
+	Fix a leak of the xmlProp returned data.
+
 2001-08-27  Darin Adler  <darin@bentspoon.com>
 
 	* helper-utilities/error-dialog/Makefile.am:
diff --git a/libnautilus-private/nautilus-link.c b/libnautilus-private/nautilus-link.c
index 545fe493b..cf46dfd38 100644
--- a/libnautilus-private/nautilus-link.c
+++ b/libnautilus-private/nautilus-link.c
@@ -237,8 +237,11 @@ local_set_root_property (const char *path,
 	old_value = xmlGetProp (root, key);
 	if (old_value != NULL && strcmp (old_value, value) == 0) {
 		xmlFreeDoc (document);
+		xmlFree (old_value);
 		return TRUE;
 	}
+	
+	xmlFree (old_value);
 
 	/* Change and write the property. */
 	xmlSetProp (root, key, value);
diff --git a/src/nautilus-complex-search-bar.c b/src/nautilus-complex-search-bar.c
index 697e75887..0e56029b0 100644
--- a/src/nautilus-complex-search-bar.c
+++ b/src/nautilus-complex-search-bar.c
@@ -456,7 +456,7 @@ load_find_them_pixmap_widget (void)
 	GdkBitmap *mask;
 	
 	pixbuf = gdk_pixbuf_new_from_file (NAUTILUS_PIXMAPDIR "/search.png");
-	if (pixmap != NULL) {
+	if (pixbuf != NULL) {
 		gdk_pixbuf_render_pixmap_and_mask (pixbuf, &pixmap, &mask, EEL_STANDARD_ALPHA_THRESHHOLD);
 		gdk_pixbuf_unref (pixbuf);
 		return gtk_pixmap_new (pixmap, mask);
diff --git a/src/nautilus-switchable-search-bar.c b/src/nautilus-switchable-search-bar.c
index 7ed0a8df7..981362e18 100644
--- a/src/nautilus-switchable-search-bar.c
+++ b/src/nautilus-switchable-search-bar.c
@@ -115,7 +115,6 @@ nautilus_switchable_search_bar_new (NautilusWindow *window)
 {
 	GtkWidget *label;
 	GtkWidget *event_box;
-	GtkWidget *vbox;
 	GtkWidget *hbox;
 	GtkWidget *switchable_search_bar;
 	NautilusSwitchableSearchBar *bar;
@@ -128,7 +127,6 @@ nautilus_switchable_search_bar_new (NautilusWindow *window)
 	gtk_container_set_border_width (GTK_CONTAINER (event_box),
 					GNOME_PAD_SMALL);
 	
-	vbox = gtk_vbox_new (0, FALSE);
 	label = gtk_label_new (_("Find:"));
 	gtk_container_add (GTK_CONTAINER (event_box), label);