diff --git a/gtk-gui.c b/gtk-gui.c
index 8d611242d..d797b8d56 100644
--- a/gtk-gui.c
+++ b/gtk-gui.c
@@ -526,6 +526,7 @@ static void pick_default_file(GtkWidget *w, GtkButton *button)
 
 	free(current_def_dir);
 	free(current_def_file);
+	free((void *)current_default);
 	gtk_widget_destroy(fs_dialog);
 	gtk_window_set_accept_focus(GTK_WINDOW(preferences), TRUE);
 }
diff --git a/info.c b/info.c
index 3f7bbcd58..ad482f11d 100644
--- a/info.c
+++ b/info.c
@@ -113,10 +113,13 @@ void show_dive_info(struct dive *dive)
 	const char *text;
 	char buffer[80];
 	char title[80];
+	char *basename;
 
 	if (!dive) {
 		if (existing_filename) {
-			snprintf(title, 80, "Subsurface: %s", g_path_get_basename(existing_filename));
+			basename = g_path_get_basename(existing_filename);
+			snprintf(title, 80, "Subsurface: %s", basename);
+			free(basename);
 			gtk_window_set_title(GTK_WINDOW(main_window), title);
 		} else {
 			gtk_window_set_title(GTK_WINDOW(main_window), "Subsurface");
@@ -145,7 +148,9 @@ void show_dive_info(struct dive *dive)
 
 	/* put it all together */
 	if (existing_filename) {
-		snprintf(title, 80, "%s: %s", g_path_get_basename(existing_filename), text);
+		basename = g_path_get_basename(existing_filename);
+		snprintf(title, 80, "%s: %s", basename, text);
+		free(basename);
 		gtk_window_set_title(GTK_WINDOW(main_window), title);
 	} else {
 		gtk_window_set_title(GTK_WINDOW(main_window), text);