diff --git a/DESCRIPTION b/DESCRIPTION
index c1421d2..d8aba90 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: kit
 Type: Package
 Title: Data Manipulation Functions Implemented in C
-Version: 0.0.21
-Date: 2026-01-22
+Version: 0.0.22
+Date: 2026-08-25
 Authors@R: c(person("Morgan", "Jacob", role = c("aut", "cph"), email = "morgan.emailbox@gmail.com"), 
              person("Sebastian", "Krantz", role = c("ctb", "cre"), email = "sebastian.krantz@graduateinstitute.ch"))
 Author: Morgan Jacob [aut, cph], Sebastian Krantz [ctb, cre]
diff --git a/NEWS.md b/NEWS.md
index 4d59980..7b1bc84 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,17 @@
+# kit 0.0.22 <small>(2026-08-25)</small>
+
+### Bug Fixes
+
+- Fix `shareData` and `getData` on platforms where `shm_open` requires names to start with a slash, e.g. FreeBSD. Shared memory object names are now normalized on all POSIX platforms as recommended by POSIX. Thanks to @nunotexbsd for raising an issue (#40).
+
+- Fix a mapping leak in `getData` where the wrong region was unmapped during cleanup.
+
+### Notes
+
+- File descriptors from `shm_open` are now closed after the mappings are established.
+
+- The test suite now skips `shareData` checks gracefully when POSIX shared memory is unavailable instead of aborting the whole run.
+
 # kit 0.0.21 <small>(2026-01-17)</small>
 
 ### New Features
diff --git a/R/call.R b/R/call.R
index f480992..779a6f7 100644
--- a/R/call.R
+++ b/R/call.R
@@ -61,11 +61,13 @@ psort = function(x, decreasing = FALSE, na.last = NA, nThread=getOption("kit.nTh
   sort(x, decreasing = decreasing, na.last = na.last,method = if(c.locale) "radix" else "quick")
 }
 
+shmName = function(map_name) sub("^/*", "/", map_name)
+
 shareData = function(data, map_name, verbose=FALSE) {
   conn = rawConnection(raw(0L), "w")
   serialize(data, conn)
   seek(conn, 0L)
-  if (grepl('SunOS',Sys.info()['sysname'])) map_name = paste0("/",map_name)
+  map_name = shmName(map_name)
   x = .Call(
     "CcreateMappingObjectR", map_name, paste0(map_name,"_key"),
     rawConnectionValue(conn), verbose
@@ -75,7 +77,7 @@ shareData = function(data, map_name, verbose=FALSE) {
 }
 
 getData = function(map_name, verbose=FALSE) {
-  if (grepl('SunOS',Sys.info()['sysname'])) map_name = paste0("/",map_name)
+  map_name = shmName(map_name)
   output = .Call("CgetMappingObjectR", map_name, paste0(map_name,"_key"), verbose)
   conn = rawConnection(output,"r")
   obj = unserialize(conn)
diff --git a/src/share.c b/src/share.c
index 548b8b4..8a7d61c 100644
--- a/src/share.c
+++ b/src/share.c
@@ -138,6 +138,11 @@ SEXP createMappingObjectR (SEXP MapObjectName, SEXP MapLengthName, SEXP DataObje
     error("* Map view file...ERROR");
   }
   if (verbose) Rprintf("* Map view file...OK\n");
+#ifndef WIN32
+  if (close(foo->fd_addr) == -1 || close(foo->fd_length) == -1) {
+    error("* Closing file descriptors...ERROR");
+  }
+#endif
 #ifdef WIN32
   CopyMemory((LPVOID)foo->lpMapAddress, RAW(DataObject), BUF_SIZE);
   CopyMemory((LPVOID)foo->lpMapLength, &len, sizeof(size_t));
@@ -204,6 +209,11 @@ SEXP getMappingObjectR (SEXP MapObjectName, SEXP MapLengthName, SEXP verboseArg)
     error("* Map view file (address)...ERROR");
   }
   if (verbose) Rprintf("* Map view file (address)...OK\n");
+#ifndef WIN32
+  if (close(fd_addr) == -1 || close(fd_length) == -1) {
+    error("* Closing file descriptors...ERROR");
+  }
+#endif
   SEXP ans = PROTECT(allocVector(RAWSXP, len));
   if (verbose) Rprintf("* Create RAW Vector...OK\n");
 #ifdef WIN32
@@ -233,7 +243,7 @@ SEXP getMappingObjectR (SEXP MapObjectName, SEXP MapLengthName, SEXP verboseArg)
 #ifdef WIN32
   if (!UnmapViewOfFile(lpMapAddress)) {
 #else
-  if (munmap(length, len*sizeof(Rbyte)) == -1) {
+  if (munmap(addr, len*sizeof(Rbyte)) == -1) {
 #endif
     error("* Closing mapping file (address)...ERROR");
   }
diff --git a/tests/test_kit.R b/tests/test_kit.R
index 1bc4436..21b6b71 100644
--- a/tests/test_kit.R
+++ b/tests/test_kit.R
@@ -1759,10 +1759,15 @@ rm(x1)
 #                                   shareData
 # --------------------------------------------------------------------------------------------------
 
-x = shareData(mtcars,"share1")
-
-check("0022.001", getData("share1"), mtcars)
-check("0022.002", clearData(x), TRUE)
+x = tryCatch(shareData(mtcars,"share1"), error=function(err) {
+  cat("Skipping shareData tests:", conditionMessage(err), "\n")
+  NULL
+})
+
+if (!is.null(x)) {
+  check("0022.001", getData("share1"), mtcars)
+  check("0022.002", clearData(x), TRUE)
+}
 
 rm(x)