diff --git a/pclsync/pfs.c b/pclsync/pfs.c
index 394c20b..be0195c 100644
--- a/pclsync/pfs.c
+++ b/pclsync/pfs.c
@@ -29,6 +29,8 @@
 */
 
 #include <errno.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 #include <fuse.h>
 #include <pthread.h>
 #include <stdint.h>
@@ -3516,9 +3518,13 @@ static char *psync_fuse_get_mountpoint() {
                 "Mount point %s has a stale FUSE mount (Transport endpoint is not connected). "
                 "Please unmount it first with: fusermount -u %s", mp, mp);
     } else if (stat_errno == ENOENT) {
+      if (mkdir(mp, 0755) == 0) {
+        pdbg_logf(D_NOTICE, "Mount point %s did not exist, created it.", mp);
+        return mp;
+      }
       pdbg_logf(D_CRITICAL,
-                "Mount point %s does not exist. "
-                "Please create the directory first with: mkdir -p %s", mp, mp);
+                "Mount point %s does not exist and could not be created: %s",
+                mp, strerror(errno));
     } else {
       pdbg_logf(D_CRITICAL,
                 "Cannot access mount point %s (errno=%d: %s). "
diff --git a/pclsync/pmem.c b/pclsync/pmem.c
index 363e5b4..2a90458 100644
--- a/pclsync/pmem.c
+++ b/pclsync/pmem.c
@@ -118,13 +118,14 @@ void *pmem_realloc(pmem_subsystem_t subsystem, void *ptr, size_t size) {
   
   hdr = ((pmem_header_t *)ptr) - 1;
   old_size = hdr->size;
-  
+  pmem_subsystem_t old_subsystem = hdr->subsystem;
+
   new_hdr = (pmem_header_t *)realloc(hdr, total_size);
   if (!new_hdr) {
     return NULL;
   }
-  
-  __atomic_sub_fetch(&subsystem_stats[hdr->subsystem], old_size, __ATOMIC_RELAXED);
+
+  __atomic_sub_fetch(&subsystem_stats[old_subsystem], old_size, __ATOMIC_RELAXED);
   __atomic_add_fetch(&subsystem_stats[subsystem], size, __ATOMIC_RELAXED);
   
   new_hdr->size = size;