diff --git a/data/apps_gnome_settings_daemon_housekeeping.schemas.in b/data/apps_gnome_settings_daemon_housekeeping.schemas.in
index 9a3c8d3..8f9697a 100644
--- a/data/apps_gnome_settings_daemon_housekeeping.schemas.in
+++ b/data/apps_gnome_settings_daemon_housekeeping.schemas.in
@@ -7,7 +7,7 @@
 	    <type>float</type>
 	    <default>0.05</default>
 	    <locale name="C">
-	        <short>Free percent notify threshold</short>
+	        <short>Free percentage notify threshold</short>
 		<long>Percentage free space threshold for initial warning of low disk space.
 				If the percentage free space drops below this, a warning will be shown</long>
 	    </locale>
@@ -19,7 +19,7 @@
 	    <type>float</type>
 	    <default>0.01</default>
 	    <locale name="C">
-	        <short>Subsequent free percent notify threshold</short>
+	        <short>Subsequent free percentage notify threshold</short>
 		<long>Specify the percentage that the free disk space should reduce by before issuing a subsequent warning</long>
 	    </locale>
 		</schema>
diff --git a/plugins/housekeeping/gsd-disk-space.c b/plugins/housekeeping/gsd-disk-space.c
index 0738331..a91940c 100644
--- a/plugins/housekeeping/gsd-disk-space.c
+++ b/plugins/housekeeping/gsd-disk-space.c
@@ -23,6 +23,8 @@
 
 /* gcc -DHAVE_LIBNOTIFY -DTEST -Wall `pkg-config --cflags --libs gobject-2.0 gio-unix-2.0 glib-2.0 gtk+-2.0 libnotify` -o gsd-disk-space-test gsd-disk-space.c */
 
+#include "config.h"
+
 #include <sys/statvfs.h>
 #include <time.h>
 #include <unistd.h>
@@ -131,19 +133,18 @@ ldsm_mount_has_trash (LdsmMountInfo *mount)
                 
                 uid = g_strdup_printf ("%d", getuid ());
                 trash_files_dir = g_build_filename (path, ".Trash", uid, "files", NULL);
-                if (!g_file_test (trash_files_dir, G_FILE_TEST_EXISTS) || !g_file_test (trash_files_dir, G_FILE_TEST_IS_DIR)) {
+                if (!g_file_test (trash_files_dir, G_FILE_TEST_IS_DIR)) {
                         gchar *trash_dir;
                         
                         g_free (trash_files_dir);
                         trash_dir = g_strdup_printf (".Trash-%s", uid);
                         trash_files_dir = g_build_filename (path, trash_dir, "files", NULL);
-                        if (!g_file_test (trash_files_dir, G_FILE_TEST_EXISTS) || !g_file_test (trash_files_dir, G_FILE_TEST_IS_DIR)) {
+                        g_free (trash_dir);
+                        if (!g_file_test (trash_files_dir, G_FILE_TEST_IS_DIR)) {
                                 g_free (trash_files_dir);
-                                g_free (trash_dir);
                                 g_free (uid);
                                 return has_trash;
                         }
-                        g_free (trash_dir);
                 }
                 g_free (uid);
         }
diff --git a/plugins/housekeeping/gsd-ldsm-dialog.c b/plugins/housekeeping/gsd-ldsm-dialog.c
index 3dad526..fbab022 100644
--- a/plugins/housekeeping/gsd-ldsm-dialog.c
+++ b/plugins/housekeeping/gsd-ldsm-dialog.c
@@ -55,19 +55,15 @@ static void     gsd_ldsm_dialog_init        (GsdLdsmDialog      *dialog);
 
 G_DEFINE_TYPE (GsdLdsmDialog, gsd_ldsm_dialog, GTK_TYPE_DIALOG);
 
-static gchar*
+static const gchar*
 gsd_ldsm_dialog_get_checkbutton_text (GsdLdsmDialog *dialog)
 {
-        gchar *text;
-        
         g_return_val_if_fail (GSD_IS_LDSM_DIALOG (dialog), NULL);
         
         if (dialog->priv->other_partitions)
-                text = g_strdup (_("Don't show any warnings again for this filesystem"));
+                return _("Don't show any warnings again for this filesystem");
         else
-                text = g_strdup (_("Don't show any warnings again"));
-        
-        return text;
+                return _("Don't show any warnings again");
 }
 
 static gchar*
@@ -92,32 +88,28 @@ gsd_ldsm_dialog_get_primary_text (GsdLdsmDialog *dialog)
         return primary_text;	
 }
 
-static gchar*
+static const gchar*
 gsd_ldsm_dialog_get_secondary_text (GsdLdsmDialog *dialog)
 {
-        gchar *secondary_text;
-	
         g_return_val_if_fail (GSD_IS_LDSM_DIALOG (dialog), NULL);
 	
         if (dialog->priv->other_usable_partitions) {
                 if (dialog->priv->has_trash) {
-                        secondary_text = g_strdup (_("You can free up disk space by emptying the Trash, removing " \
-                                                   "unused programs or files, or moving files to another disk or partition."));
+                        return _("You can free up disk space by emptying the Trash, removing " \
+                                 "unused programs or files, or moving files to another disk or partition.");
                 } else {
-                        secondary_text = g_strdup (_("You can free up disk space by removing unused programs or files, " \
-                                                   "or by moving files to another disk or partition."));
+                        return _("You can free up disk space by removing unused programs or files, " \
+                                 "or by moving files to another disk or partition.");
                 }
         } else {
                 if (dialog->priv->has_trash) {
-                        secondary_text = g_strdup (_("You can free up disk space by emptying the Trash, removing unused " \
-                                                   "programs or files, or moving files to an external disk."));
+                        return _("You can free up disk space by emptying the Trash, removing unused " \
+                                 "programs or files, or moving files to an external disk.");
                 } else {
-                        secondary_text = g_strdup (_("You can free up disk space by removing unused programs or files, " \
-                                                   "or by moving files to an external disk."));
+                        return _("You can free up disk space by removing unused programs or files, " \
+                                 "or by moving files to an external disk.");
                 }
         }
-	
-        return secondary_text;
 }
 
 static gint
@@ -133,6 +125,7 @@ update_ignore_paths (GSList **ignore_paths,
                      gboolean ignore)
 {
         GSList *found;
+        gchar *path_to_remove;
         
         found = g_slist_find_custom (*ignore_paths, mount_path, (GCompareFunc) ignore_path_compare);
         
@@ -142,7 +135,9 @@ update_ignore_paths (GSList **ignore_paths,
         }
         
         if (!ignore && (found != NULL)) {
-                *ignore_paths = g_slist_remove (*ignore_paths, found->data);
+                path_to_remove = found->data;
+                *ignore_paths = g_slist_remove (*ignore_paths, path_to_remove);
+                g_free (path_to_remove);
                 return TRUE;
         }
                 
@@ -426,7 +421,8 @@ gsd_ldsm_dialog_new (gboolean     other_usable_partitions,
         GsdLdsmDialog *dialog;
         GtkWidget *button_empty_trash, *button_ignore, *button_analyze;
         GtkWidget *empty_trash_image, *analyze_image, *ignore_image;
-        gchar *primary_text, *secondary_text, *primary_text_markup, *checkbutton_text;
+        gchar *primary_text, *primary_text_markup;
+        const gchar *secondary_text, *checkbutton_text;
 	
         dialog = GSD_LDSM_DIALOG (g_object_new (GSD_TYPE_LDSM_DIALOG,
                                                 "other-usable-partitions", other_usable_partitions,
@@ -475,8 +471,6 @@ gsd_ldsm_dialog_new (gboolean     other_usable_partitions,
         
         g_free (primary_text);
         g_free (primary_text_markup);
-        g_free (secondary_text);
-        g_free (checkbutton_text);
 	
         return dialog;
 } 
diff --git a/plugins/housekeeping/gsd-ldsm-trash-empty.c b/plugins/housekeeping/gsd-ldsm-trash-empty.c
index d19e64f..581929a 100644
--- a/plugins/housekeeping/gsd-ldsm-trash-empty.c
+++ b/plugins/housekeeping/gsd-ldsm-trash-empty.c
@@ -292,7 +292,7 @@ trash_empty_start ()
 	
         markup = g_markup_printf_escaped ("<big><b>%s</b></big>", _("Emptying the trash"));
         gtk_label_set_markup (GTK_LABEL (label1), markup);
-        gtk_label_set_text (GTK_LABEL (label3), _("From:"));
+        gtk_label_set_text (GTK_LABEL (label3), _("From: "));
 	
         cancellable = g_cancellable_new ();
         g_signal_connect_object (trash_empty_dialog, "response",
