diff --git a/src/cache.c b/src/cache.c
index 9e3e74a..e0f44a2 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -88,6 +88,7 @@ static char *CacheSystem_calc_dir(const char *url)
         fprintf(stderr, "CacheSystem_calc_dir(): mkdir(): %s\n",
                 strerror(errno));
         }
+    free(fn);
     free(cache_dir_root);
     curl_free(escaped_url);
     curl_easy_cleanup(c);
@@ -115,10 +116,9 @@ void CacheSystem_init(const char *path, int url_supplied)
                 "CacheSystem_init(): opendir(): %s\n", strerror(errno));
         exit_failure();
     }
-
+    closedir(dir);
     META_DIR = path_append(path, "meta/");
     DATA_DIR = path_append(path, "data/");
-
     /* Check if directories exist, if not, create them */
     if (mkdir(META_DIR, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH)
         && (errno != EEXIST)) {
@@ -463,6 +463,8 @@ int CacheDir_create(const char *dirn)
     if (i && (errno != EEXIST)) {
         fprintf(stderr, "CacheDir_create(): mkdir(): %s\n", strerror(errno));
     }
+    free(datadirn);
+    free(metadirn);
     return -i;
 }
 
diff --git a/src/link.c b/src/link.c
index f08866b..4e56c52 100644
--- a/src/link.c
+++ b/src/link.c
@@ -71,6 +71,7 @@ LinkTable *LinkSystem_init(const char *raw_url)
             ROOT_LINK_TBL = sonic_LinkTable_new_id3(0, "0");
         }
     }
+    free(url);
     return ROOT_LINK_TBL;
 }
 
diff --git a/src/main.c b/src/main.c
index 154f052..c0b9888 100644
--- a/src/main.c
+++ b/src/main.c
@@ -134,6 +134,7 @@ void parse_config_file(char ***argv, int *argc)
             }
         }
     }
+    free(full_path);
 }
 
 static int