diff --git a/src/fs_mktemp.cpp b/src/fs_mktemp.cpp
index 39e45ebe..34c2bf5e 100644
--- a/src/fs_mktemp.cpp
+++ b/src/fs_mktemp.cpp
@@ -25,6 +25,7 @@
 
 #include <cstdlib>
 #include <string>
+#include <tuple>
 
 #define PAD_LEN             16
 #define MAX_ATTEMPTS        3
@@ -75,12 +76,12 @@ namespace fs
         if((fd == -1) && (errno == EEXIST))
           continue;
         if(fd == -1)
-          return {-errno,std::string{}};
+          return std::make_tuple(-errno,std::string());
 
-        return {fd,tmp_filepath};
+        return std::make_tuple(fd,tmp_filepath);
       }
 
-    return {-EEXIST,std::string{}};
+    return std::make_tuple(-EEXIST,std::string());
   }
 
   std::tuple<int,std::string>
diff --git a/src/gidcache.cpp b/src/gidcache.cpp
index dbd61f06..cdf71b4e 100644
--- a/src/gidcache.cpp
+++ b/src/gidcache.cpp
@@ -34,11 +34,10 @@
 #include <unordered_map>
 #include <mutex>
 
-
 #include "gidcache.hpp"
 
-std::mutex                          g_REGISTERED_CACHES_MUTEX;
-std::unordered_map<pid_t,GIDCache*> g_REGISTERED_CACHES;
+std::mutex                              g_REGISTERED_CACHES_MUTEX;
+std::unordered_map<pthread_t,GIDCache*> g_REGISTERED_CACHES;
 
 
 inline
@@ -55,11 +54,11 @@ GIDCache::GIDCache()
 {
   std::lock_guard<std::mutex> guard(g_REGISTERED_CACHES_MUTEX);
 
-  pid_t tid;
-  bool  inserted;
+  bool inserted;
+  pthread_t pthid;
 
-  tid = ::gettid();
-  inserted = g_REGISTERED_CACHES.emplace(tid,this).second;
+  pthid = pthread_self();
+  inserted = g_REGISTERED_CACHES.emplace(pthid,this).second;
 
   assert(inserted == true);
 }