diff --git a/pclsync/pcache.c b/pclsync/pcache.c
index 3fb9379..c71de85 100644
--- a/pclsync/pcache.c
+++ b/pclsync/pcache.c
@@ -81,7 +81,7 @@ static void cache_timer(psync_timer_t timer, void *ptr) {
   pthread_mutex_lock(&cachelocks[hash_to_lock(he->hash)]);
   psync_list_del(&he->list);
   pthread_mutex_unlock(&cachelocks[hash_to_lock(he->hash)]);
-  pmem_free(PMEM_SUBSYS_OTHER, he->value);
+  he->free(he->value);
   pmem_free(PMEM_SUBSYS_OTHER, he);
   ptimer_stop(timer);
 }
@@ -229,7 +229,7 @@ void pcache_clean() {
       he = psync_list_element(l1, cache_entry_t, list);
       if (!ptimer_stop(he->timer)) {
         psync_list_del(l1);
-        pmem_free(PMEM_SUBSYS_OTHER, he->value);
+        he->free(he->value);
         pmem_free(PMEM_SUBSYS_OTHER, he);
       }
     }
@@ -256,7 +256,7 @@ void pcache_clean_oneof(const char **prefixes, size_t cnt) {
         continue;
       if (!ptimer_stop(he->timer)) {
         psync_list_del(l1);
-        pmem_free(PMEM_SUBSYS_OTHER, he->value);
+        he->free(he->value);
         pmem_free(PMEM_SUBSYS_OTHER, he);
       }
     }
diff --git a/pclsync/pfs.c b/pclsync/pfs.c
index be0195c..d163eab 100644
--- a/pclsync/pfs.c
+++ b/pclsync/pfs.c
@@ -2240,6 +2240,7 @@ pfs_reopen_file_for_writing(psync_openfile_t *of) {
       }
     }
     of->currentsize = of->initialsize;
+    pmem_free(PMEM_SUBSYS_OTHER, encsymkey);
     return 1;
   }
   cr = pfs_task_add_modified_file(of->currentfolder, of->currentname,
@@ -3615,29 +3616,15 @@ static void pfs_do_stop(void) {
   if (started == 1) {
 
     char *mp;
-    struct stat st_before, st_after;
     struct timespec ts = {0, 100000000};
 
     mp = psync_fuse_get_mountpoint();
+#if FUSE_USE_VERSION < 30
     if (mp) {
+      struct stat st_before;
       if (stat(mp, &st_before) == 0) {
-#if FUSE_USE_VERSION >= 30
-        fuse_unmount(psync_fuse);
-#else
         fuse_unmount(mp, psync_fuse_channel);
         psync_fuse_channel = NULL;
-#endif
-        clock_gettime(CLOCK_REALTIME, &ts);
-
-        // Check if the mountpoint is still accessible
-        if (stat(mp, &st_after) == 0) {
-          if (st_before.st_dev == st_after.st_dev) {
-            pdbg_logf(D_WARNING, "FUSE filesystem may not have unmounted properly");
-          }
-        } else if (errno != ENOENT) {
-          pdbg_logf(D_WARNING, "Unexpected error after unmount: %s",
-                strerror(errno));
-        }
       } else {
         pdbg_logf(D_WARNING, "Mountpoint not accessible before unmount: %s",
               strerror(errno));
@@ -3645,6 +3632,7 @@ static void pfs_do_stop(void) {
     } else {
       pdbg_logf(D_ERROR, "Failed to get mountpoint");
     }
+#endif
 
     pdbg_logf(D_NOTICE, "running fuse_exit");
     fuse_exit(psync_fuse);
diff --git a/pclsync/pfscrypto.c b/pclsync/pfscrypto.c
index 844763e..3978850 100644
--- a/pclsync/pfscrypto.c
+++ b/pclsync/pfscrypto.c
@@ -531,6 +531,10 @@ int pfs_crpt_read_new(psync_openfile_t *of, char *buf,
   return rd;
 }
 
+static void free_sector_inlog(psync_sector_inlog_t *e) {
+  pmem_free(PMEM_SUBSYS_OTHER, e);
+}
+
 static void
 pfs_crypto_set_sector_log_offset(psync_openfile_t *of,
                                       psync_crypto_sectorid_t sectorid,
@@ -1093,7 +1097,7 @@ static int pfs_crypto_do_finalize_log(psync_openfile_t *of, int fullsync) {
     pmem_free(PMEM_SUBSYS_OTHER, flog);
     return -EIO;
   }
-  ptree_for_each_element_call_safe(of->sectorsinlog, psync_sector_inlog_t, tree, free);
+  ptree_for_each_element_call_safe(of->sectorsinlog, psync_sector_inlog_t, tree, free_sector_inlog);
   of->sectorsinlog = PSYNC_TREE_EMPTY;
   ret = pfs_crypto_log_flush_and_process(of, flog, 0, 1);
   pfile_delete(flog);
@@ -1690,7 +1694,7 @@ static int pfs_crpt_truncate_to_zero(psync_openfile_t *of) {
     psync_interval_tree_add(&of->writeintervals, 0,
                             pfs_crpt_crypto_size(of->initialsize));
   }
-  ptree_for_each_element_call_safe(of->sectorsinlog, psync_sector_inlog_t, tree, free);
+  ptree_for_each_element_call_safe(of->sectorsinlog, psync_sector_inlog_t, tree, free_sector_inlog);
   of->sectorsinlog = PSYNC_TREE_EMPTY;
   of->currentsize = 0;
   pfs_crypto_kill_extender_locked(of);
diff --git a/pclsync/pfstasks.c b/pclsync/pfstasks.c
index 75db4dc..fd1cd14 100644
--- a/pclsync/pfstasks.c
+++ b/pclsync/pfstasks.c
@@ -1116,6 +1116,10 @@ int pfs_task_unlink(psync_fsfolderid_t folderid, const char *name) {
   return 0;
 }
 
+static void free_file_history_record(void *ptr) {
+  pmem_free(PMEM_SUBSYS_SYNC, ptr);
+}
+
 static void add_history_record(psync_fileid_t fileid, psync_folderid_t folderid,
                                const char *name) {
   file_history_record *rec;
@@ -1131,7 +1135,7 @@ static void add_history_record(psync_fileid_t fileid, psync_folderid_t folderid,
     return;
   rec->folderid = folderid;
   memcpy(rec->name, name, len);
-  pcache_add(key, rec, PSYNC_FS_FILE_LOC_HIST_SEC, free, 1);
+  pcache_add(key, rec, PSYNC_FS_FILE_LOC_HIST_SEC, free_file_history_record, 1);
 }
 
 int pfs_task_rename_file(psync_fsfileid_t fileid,
diff --git a/pclsync/pfsupload.c b/pclsync/pfsupload.c
index 20aa407..164b0c3 100644
--- a/pclsync/pfsupload.c
+++ b/pclsync/pfsupload.c
@@ -318,6 +318,7 @@ static int clean_uploads_for_task(psock_t *api, psync_uploadid_t taskid) {
     } else
       pmem_free(PMEM_SUBSYS_UPLOAD, res);
   }
+  pmem_free(PMEM_SUBSYS_UPLOAD, fr);
   sql = psql_prepare("DELETE FROM fstaskupload WHERE fstaskid=?");
   psql_bind_uint(sql, 1, taskid);
   psql_run_free(sql);
diff --git a/pclsync/pintervaltree.c b/pclsync/pintervaltree.c
index f246d81..6ee7ed6 100644
--- a/pclsync/pintervaltree.c
+++ b/pclsync/pintervaltree.c
@@ -143,9 +143,13 @@ void psync_interval_tree_remove(psync_interval_tree_t **tree, uint64_t from,
   }
 }
 
+static void free_interval_tree_node(psync_interval_tree_t *e) {
+  pmem_free(PMEM_SUBSYS_OTHER, e);
+}
+
 void psync_interval_tree_free(psync_interval_tree_t *tree) {
   if (tree)
-    ptree_for_each_element_call_safe(&tree->tree, psync_interval_tree_t, tree, free);
+    ptree_for_each_element_call_safe(&tree->tree, psync_interval_tree_t, tree, free_interval_tree_node);
 }
 
 static psync_interval_tree_t *
diff --git a/pclsync/ppagecache.c b/pclsync/ppagecache.c
index 4a49da2..08d3b30 100644
--- a/pclsync/ppagecache.c
+++ b/pclsync/ppagecache.c
@@ -509,6 +509,10 @@ static int wait_shared_api() {
   return ret;
 }
 
+static void free_binresult_cache(void *ptr) {
+  pmem_free(PMEM_SUBSYS_CACHE, ptr);
+}
+
 static void set_urls(psync_urls_t *urls, binresult *res) {
   pthread_mutex_lock(&url_cache_mutex);
   if (res) {
@@ -737,7 +741,7 @@ static void release_urls(psync_urls_t *urls) {
       etime = papi_find_result2(urls->urls, "expires", PARAM_NUM)->num;
       if (etime > ctime + 3600) {
         psync_get_string_id(buff, "URLS", urls->hash);
-        pcache_add(buff, urls->urls, etime - ctime - 3600, free, 2);
+        pcache_add(buff, urls->urls, etime - ctime - 3600, free_binresult_cache, 2);
         urls->urls = NULL;
       }
     }
diff --git a/pclsync/prpc.c b/pclsync/prpc.c
index 221be7a..fd41ecc 100644
--- a/pclsync/prpc.c
+++ b/pclsync/prpc.c
@@ -241,11 +241,13 @@ void prpc_main_loop() {
   char *sockpath = prpc_sockpath();
   if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) {
     pdbg_logf(D_ERROR, "Unix socket error failed to open %s", sockpath);
+    pmem_free(PMEM_SUBSYS_OTHER, sockpath);
     return;
   }
 
   if (fchmod(fd, 0600) == -1) {
     pdbg_logf(D_ERROR, "Failed to set socket permissions");
+    pmem_free(PMEM_SUBSYS_OTHER, sockpath);
     return;
   }
 
@@ -257,9 +259,10 @@ void prpc_main_loop() {
 
   if (bind(fd, (struct sockaddr *)&addr, strlen(sockpath) + sizeof(addr.sun_family)) == -1) {
     pdbg_logf(D_ERROR, "Unix socket bind error");
+    pmem_free(PMEM_SUBSYS_OTHER, sockpath);
     return;
   }
-  
+
   pmem_free(PMEM_SUBSYS_OTHER, sockpath);
 
   if (listen(fd, 5) == -1) {
@@ -335,5 +338,6 @@ char *prpc_sockpath() {
     }
 
     snprintf(sockpath, len, "%s%s", home, subdir);
+    pmem_free(PMEM_SUBSYS_OTHER, home);
     return sockpath;
 }