diff --git a/src/index.c b/src/index.c
index 49efc17b5cfca3373f32fbb1351c7a10aad345d7..580585d219ad3e6d0bafd3939ad645f4cc7bca85 100644
--- a/src/index.c
+++ b/src/index.c
@@ -448,6 +448,7 @@ void get_index_string_dim(feh_file *file, Imlib_Font fn, int *fw, int *fh)
 	 * leading e.g. to a 0x0 report for index_dim = "%n".
 	 */
 	if (file == NULL) {
+		fake_file = 1;
 		file = feh_file_new("foo");
 		file->info = feh_file_info_new();
 	}
diff --git a/src/thumbnail.c b/src/thumbnail.c
index 191fc8e9efae26792753df9a9c6bd599f690b5bb..f7a31c617fcea703f673d890c194350c654b84f4 100644
--- a/src/thumbnail.c
+++ b/src/thumbnail.c
@@ -921,11 +921,14 @@ int feh_thumbnail_setup_thumbnail_dir(void)
 					weprintf("unable to create %s directory", dir_thumbnails);
 			}
 
+			free(dir_thumbnails);
+
 			if (mkdir(dir, 0700) == -1)
 				weprintf("unable to create %s directory", dir);
 			else
 				status = 1;
 		}
+		free(dir);
 	}
 
 	return status;