diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1db35e7339e9f4540f0cc955e28246c953615236..5faf35a73f266b1b486347f91d915ff2d50ec17f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,11 +13,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 - GKFS_ENABLE_UNUSED_FUNCTIONS added to disable code to increase code coverage.
 - Updated Parallax version to new API (parallax option needs kv_format.parallax in the path, and the database in a device with O_DIRECT)
 - Support for increasing file size via `truncate()` added ([!159](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/159)
-
+- Added PowerPC support ([!151](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/151)).
 ### Changed
 
-- Support parallelism for path resolution tests ([!145](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/145))
-  .
+- Support parallelism for path resolution tests ([!145](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/145)).
 - Support parallelism for symlink tests ([!147](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/147)).
 - Updatd Parallax release (PARALLAX-exp)
 
diff --git a/include/client/hooks.hpp b/include/client/hooks.hpp
index 9e16287df5ccb94440a6fdfe038403a566b71e07..6871d8b798f9c7a4e47e7bcc1988c0478552c608 100644
--- a/include/client/hooks.hpp
+++ b/include/client/hooks.hpp
@@ -36,7 +36,27 @@ extern "C" {
 #include <sys/stat.h>
 #include <sys/syscall.h>
 }
+#include <libsyscall_intercept_hook_point.h>
 
+/*
+ * For PowerPC, syscall_no_intercept_wrapper() is defined in the
+ * syscall intercept branch `powerpc` and file
+ * `include/libsyscall_intercept_hook_point.h`
+ */
+#ifndef _ARCH_PPC64
+template <class... Args>
+inline long
+syscall_no_intercept_wrapper(long syscall_number, Args... args) {
+    long result;
+    int error;
+    result = syscall_no_intercept(syscall_number, args...);
+    error = syscall_error_code(result);
+    if(error != 0) {
+        return -error;
+    }
+    return result;
+}
+#endif
 
 struct statfs;
 struct linux_dirent;
diff --git a/scripts/dl_dep.sh b/scripts/dl_dep.sh
index 88b7f5a21cf28c1571e53afef1b8d8c2c909c9cf..98ece483021493f6ad70ec3abb8386f4887deea2 100755
--- a/scripts/dl_dep.sh
+++ b/scripts/dl_dep.sh
@@ -28,7 +28,7 @@
 ################################################################################
 
 COMMON_CURL_FLAGS="--silent --fail --show-error --location -O"
-COMMON_GIT_FLAGS="--quiet --single-branch -c advice.detachedHead=false"
+COMMON_GIT_FLAGS="--quiet -c advice.detachedHead=false"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 PATCH_DIR="${SCRIPT_DIR}/patches"
 DEPENDENCY=""
diff --git a/scripts/profiles/0.9.1/p9.specs b/scripts/profiles/0.9.1/p9.specs
new file mode 100644
index 0000000000000000000000000000000000000000..6c78aa1ee8e20a8cbbc23b79b1fbbb3ea5113318
--- /dev/null
+++ b/scripts/profiles/0.9.1/p9.specs
@@ -0,0 +1,82 @@
+################################################################################
+# Copyright 2018-2021, Barcelona Supercomputing Center (BSC), Spain            #
+# Copyright 2015-2021, Johannes Gutenberg Universitaet Mainz, Germany          #
+#                                                                              #
+# This software was partially supported by the                                 #
+# EC H2020 funded project NEXTGenIO (Project ID: 671951, www.nextgenio.eu).    #
+#                                                                              #
+# This software was partially supported by the                                 #
+# ADA-FS project under the SPPEXA project funded by the DFG.                   #
+#                                                                              #
+# This file is part of GekkoFS.                                                #
+#                                                                              #
+# GekkoFS is free software: you can redistribute it and/or modify              #
+# it under the terms of the GNU General Public License as published by         #
+# the Free Software Foundation, either version 3 of the License, or            #
+# (at your option) any later version.                                          #
+#                                                                              #
+# GekkoFS is distributed in the hope that it will be useful,                   #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                #
+# GNU General Public License for more details.                                 #
+#                                                                              #
+# You should have received a copy of the GNU General Public License            #
+# along with GekkoFS.  If not, see <https://www.gnu.org/licenses/>.            #
+#                                                                              #
+# SPDX-License-Identifier: GPL-3.0-or-later                                    #
+################################################################################
+
+# vi: ft=bash
+
+# Variables to be imported into the scripts
+declare -A wgetdeps clonedeps clonedeps_args clonedeps_patches extra_install_args
+declare -a order
+
+# Comment that should be displayed when printing the profile
+comment="Dependencies for PowerPC supercomputer"
+
+# Dependencies that must be downloaded directly
+wgetdeps=(
+    ["lz4"]="1.9.3"
+    ["capstone"]="4.0.2"
+    ["argobots"]="1.1"
+    ["rocksdb"]="6.26.1"
+    ["psm2"]="11.2.185"
+    ["json-c"]="0.15-20200726"
+)
+
+# Dependencies that must be cloned
+clonedeps=(
+    ["libfabric"]="HEAD@v1.13.2"
+    ["mercury"]="v2.1.0"
+    ["margo"]="v0.9.6"
+    ["syscall_intercept"]="6eb27a9d2053bb2ac3bb9ce30e13b64ce055c19f"
+    ["date"]="e7e1482087f58913b80a20b04d5c58d9d6d90155"
+)
+
+# Extra arguments for git clone
+clonedeps_args=(
+    ["mercury"]="--recurse-submodules"
+)
+
+# Patches that should be applied post-clone
+clonedeps_patches=(
+    ["syscall_intercept"]="syscall_intercept.patch"
+)
+
+# Ordering that MUST be followed when downloading
+order=(
+    "lz4" "capstone" "json-c" "psm2" "libfabric" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept" "date" 
+)
+
+# Extra arguments passed to the installation script. As such, they can
+# reference the following variables:
+#  - CMAKE: a variable that expands to the cmake binary
+#  - SOURCE_DIR: the directory where the sources for the package were
+#               downloaded
+#  - INSTALL_DIR: the directory where the package should be installed
+#  - CORES: the number of cores to use when building
+#  - PERFORM_TEST: whether tests for the package should be executed
+extra_install_args=(
+    ["libfabric"]="--enable-psm2=no --enable-sockets=yes"
+)
diff --git a/scripts/profiles/0.9.2/p9.specs b/scripts/profiles/0.9.2/p9.specs
new file mode 100644
index 0000000000000000000000000000000000000000..6c78aa1ee8e20a8cbbc23b79b1fbbb3ea5113318
--- /dev/null
+++ b/scripts/profiles/0.9.2/p9.specs
@@ -0,0 +1,82 @@
+################################################################################
+# Copyright 2018-2021, Barcelona Supercomputing Center (BSC), Spain            #
+# Copyright 2015-2021, Johannes Gutenberg Universitaet Mainz, Germany          #
+#                                                                              #
+# This software was partially supported by the                                 #
+# EC H2020 funded project NEXTGenIO (Project ID: 671951, www.nextgenio.eu).    #
+#                                                                              #
+# This software was partially supported by the                                 #
+# ADA-FS project under the SPPEXA project funded by the DFG.                   #
+#                                                                              #
+# This file is part of GekkoFS.                                                #
+#                                                                              #
+# GekkoFS is free software: you can redistribute it and/or modify              #
+# it under the terms of the GNU General Public License as published by         #
+# the Free Software Foundation, either version 3 of the License, or            #
+# (at your option) any later version.                                          #
+#                                                                              #
+# GekkoFS is distributed in the hope that it will be useful,                   #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                #
+# GNU General Public License for more details.                                 #
+#                                                                              #
+# You should have received a copy of the GNU General Public License            #
+# along with GekkoFS.  If not, see <https://www.gnu.org/licenses/>.            #
+#                                                                              #
+# SPDX-License-Identifier: GPL-3.0-or-later                                    #
+################################################################################
+
+# vi: ft=bash
+
+# Variables to be imported into the scripts
+declare -A wgetdeps clonedeps clonedeps_args clonedeps_patches extra_install_args
+declare -a order
+
+# Comment that should be displayed when printing the profile
+comment="Dependencies for PowerPC supercomputer"
+
+# Dependencies that must be downloaded directly
+wgetdeps=(
+    ["lz4"]="1.9.3"
+    ["capstone"]="4.0.2"
+    ["argobots"]="1.1"
+    ["rocksdb"]="6.26.1"
+    ["psm2"]="11.2.185"
+    ["json-c"]="0.15-20200726"
+)
+
+# Dependencies that must be cloned
+clonedeps=(
+    ["libfabric"]="HEAD@v1.13.2"
+    ["mercury"]="v2.1.0"
+    ["margo"]="v0.9.6"
+    ["syscall_intercept"]="6eb27a9d2053bb2ac3bb9ce30e13b64ce055c19f"
+    ["date"]="e7e1482087f58913b80a20b04d5c58d9d6d90155"
+)
+
+# Extra arguments for git clone
+clonedeps_args=(
+    ["mercury"]="--recurse-submodules"
+)
+
+# Patches that should be applied post-clone
+clonedeps_patches=(
+    ["syscall_intercept"]="syscall_intercept.patch"
+)
+
+# Ordering that MUST be followed when downloading
+order=(
+    "lz4" "capstone" "json-c" "psm2" "libfabric" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept" "date" 
+)
+
+# Extra arguments passed to the installation script. As such, they can
+# reference the following variables:
+#  - CMAKE: a variable that expands to the cmake binary
+#  - SOURCE_DIR: the directory where the sources for the package were
+#               downloaded
+#  - INSTALL_DIR: the directory where the package should be installed
+#  - CORES: the number of cores to use when building
+#  - PERFORM_TEST: whether tests for the package should be executed
+extra_install_args=(
+    ["libfabric"]="--enable-psm2=no --enable-sockets=yes"
+)
diff --git a/scripts/profiles/sources.list b/scripts/profiles/sources.list
index 2c4be6e886b43e2900934ca748460f1634d545f1..3c10823725390c576564ac18b9812b0b57201359 100644
--- a/scripts/profiles/sources.list
+++ b/scripts/profiles/sources.list
@@ -46,7 +46,7 @@ sources=(
     ["libfabric%verbs"]="https://github.com/ofiwg/libfabric.git"
     ["mercury"]="https://github.com/mercury-hpc/mercury"
     ["margo"]="https://github.com/mochi-hpc/mochi-margo"
-    ["syscall_intercept"]="https://github.com/pmem/syscall_intercept.git"
+    ["syscall_intercept"]="https://github.com/GekkoFS/syscall_intercept.git"
     ["date"]="https://github.com/HowardHinnant/date.git"
     ["agios"]="https://github.com/francielizanon/agios.git"
     ["json-c"]="https://github.com/json-c/json-c/archive/json-c-{{VERSION}}.tar.gz"
diff --git a/src/client/hooks.cpp b/src/client/hooks.cpp
index a476c2dce299d0897b3afcd6fd5a24be2455590a..49a166ce1988ff3f605b75b8da10c124290c116b 100644
--- a/src/client/hooks.cpp
+++ b/src/client/hooks.cpp
@@ -40,7 +40,6 @@
 #include <memory>
 
 extern "C" {
-#include <libsyscall_intercept_hook_point.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/statfs.h>
@@ -56,19 +55,6 @@ with_errno(int ret) {
 
 } // namespace
 
-template <class... Args>
-inline long
-syscall_no_intercept_wrapper(long syscall_number, Args... args) {
-    long result;
-    int error;
-    result = syscall_no_intercept(syscall_number, args...);
-    error = syscall_error_code(result);
-    if(error != 0) {
-        return -error;
-    }
-    return result;
-}
-
 namespace gkfs::hook {
 
 int
@@ -81,11 +67,12 @@ hook_openat(int dirfd, const char* cpath, int flags, mode_t mode) {
     auto rstatus = CTX->relativize_fd_path(dirfd, cpath, resolved);
     switch(rstatus) {
         case gkfs::preload::RelativizeStatus::fd_unknown:
-            return syscall_no_intercept(SYS_openat, dirfd, cpath, flags, mode);
+            return syscall_no_intercept_wrapper(SYS_openat, dirfd, cpath, flags,
+                                                mode);
 
         case gkfs::preload::RelativizeStatus::external:
-            return syscall_no_intercept(SYS_openat, dirfd, resolved.c_str(),
-                                        flags, mode);
+            return syscall_no_intercept_wrapper(SYS_openat, dirfd,
+                                                resolved.c_str(), flags, mode);
 
         case gkfs::preload::RelativizeStatus::fd_not_a_dir:
             return -ENOTDIR;
@@ -147,12 +134,12 @@ hook_statx(int dirfd, const char* path, int flags, unsigned int mask,
     auto rstatus = CTX->relativize_fd_path(dirfd, path, resolved);
     switch(rstatus) {
         case gkfs::preload::RelativizeStatus::fd_unknown:
-            return syscall_no_intercept(SYS_statx, dirfd, path, flags, mask,
-                                        buf);
+            return syscall_no_intercept_wrapper(SYS_statx, dirfd, path, flags,
+                                                mask, buf);
 
         case gkfs::preload::RelativizeStatus::external:
-            return syscall_no_intercept(SYS_statx, dirfd, resolved.c_str(),
-                                        flags, mask, buf);
+            return syscall_no_intercept_wrapper(
+                    SYS_statx, dirfd, resolved.c_str(), flags, mask, buf);
 
         case gkfs::preload::RelativizeStatus::fd_not_a_dir:
             return -ENOTDIR;
diff --git a/src/client/intercept.cpp b/src/client/intercept.cpp
index 57c587343ae186dee2c9fff1adccace5e167cb4a..fce6e79c6dc26093d1a0906d6adebcdb11a3b44c 100644
--- a/src/client/intercept.cpp
+++ b/src/client/intercept.cpp
@@ -39,7 +39,6 @@
 
 extern "C" {
 #include <syscall.h>
-#include <libsyscall_intercept_hook_point.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <printf.h>
@@ -84,7 +83,6 @@ hook_internal(long syscall_number, long arg0, long arg1, long arg2, long arg3,
     const long args[gkfs::syscall::MAX_ARGS] = {arg0, arg1, arg2,
                                                 arg3, arg4, arg5};
 #endif
-    int syserror = 0;
 
     LOG(SYSCALL,
         gkfs::syscall::from_internal_code | gkfs::syscall::to_hook |
@@ -94,113 +92,83 @@ hook_internal(long syscall_number, long arg0, long arg1, long arg2, long arg3,
     switch(syscall_number) {
 
         case SYS_open:
-            *result = syscall_no_intercept(
+            *result = syscall_no_intercept_wrapper(
                     syscall_number, reinterpret_cast<char*>(arg0),
                     static_cast<int>(arg1), static_cast<mode_t>(arg2));
-            syserror = syscall_error_code(*result);
 
-            if(syserror == 0) {
+            if(*result > 0) {
                 *result = CTX->register_internal_fd(*result);
-            } else {
-                *result = -syserror;
             }
 
             break;
 
         case SYS_creat:
-            *result = syscall_no_intercept(
+            *result = syscall_no_intercept_wrapper(
                     syscall_number, reinterpret_cast<const char*>(arg0),
                     O_WRONLY | O_CREAT | O_TRUNC, static_cast<mode_t>(arg1));
-            syserror = syscall_error_code(*result);
-
-            if(syserror == 0) {
+            if(*result > 0) {
                 *result = CTX->register_internal_fd(*result);
-            } else {
-                *result = -syserror;
             }
 
             break;
 
         case SYS_openat:
-            *result = syscall_no_intercept(
+            *result = syscall_no_intercept_wrapper(
                     syscall_number, static_cast<int>(arg0),
                     reinterpret_cast<const char*>(arg1), static_cast<int>(arg2),
                     static_cast<mode_t>(arg3));
-            syserror = syscall_error_code(*result);
-
-            if(syserror == 0) {
+            if(*result > 0) {
                 *result = CTX->register_internal_fd(*result);
-            } else {
-                *result = -syserror;
             }
             break;
 
         case SYS_epoll_create:
-            *result = syscall_no_intercept(syscall_number,
-                                           static_cast<int>(arg0));
-            syserror = syscall_error_code(*result);
-
-            if(syserror == 0) {
+            *result = syscall_no_intercept_wrapper(syscall_number,
+                                                   static_cast<int>(arg0));
+            if(*result > 0) {
                 *result = CTX->register_internal_fd(*result);
-            } else {
-                *result = -syserror;
             }
 
             break;
 
         case SYS_epoll_create1:
-            *result = syscall_no_intercept(syscall_number,
-                                           static_cast<int>(arg0));
-            syserror = syscall_error_code(*result);
-
-            if(syserror == 0) {
+            *result = syscall_no_intercept_wrapper(syscall_number,
+                                                   static_cast<int>(arg0));
+            if(*result > 0) {
                 *result = CTX->register_internal_fd(*result);
-            } else {
-                *result = -syserror;
             }
 
             break;
 
         case SYS_dup:
-            *result = syscall_no_intercept(syscall_number,
-                                           static_cast<unsigned int>(arg0));
-            syserror = syscall_error_code(*result);
-
-            if(syserror == 0) {
+            *result = syscall_no_intercept_wrapper(
+                    syscall_number, static_cast<unsigned int>(arg0));
+            if(*result > 0) {
                 *result = CTX->register_internal_fd(*result);
             }
-
             break;
 
         case SYS_dup2:
-            *result = syscall_no_intercept(syscall_number,
-                                           static_cast<unsigned int>(arg0),
-                                           static_cast<unsigned int>(arg1));
-            syserror = syscall_error_code(*result);
-
-            if(syserror == 0) {
+            *result = syscall_no_intercept_wrapper(
+                    syscall_number, static_cast<unsigned int>(arg0),
+                    static_cast<unsigned int>(arg1));
+            if(*result > 0) {
                 *result = CTX->register_internal_fd(*result);
             }
-
             break;
 
         case SYS_dup3:
-            *result = syscall_no_intercept(
+            *result = syscall_no_intercept_wrapper(
                     syscall_number, static_cast<unsigned int>(arg0),
                     static_cast<unsigned int>(arg1), static_cast<int>(arg2));
 
-            syserror = syscall_error_code(*result);
-
-            if(syserror == 0) {
-
-
+            if(*result > 0) {
                 *result = CTX->register_internal_fd(*result);
             }
-
             break;
 
         case SYS_inotify_init:
-            *result = syscall_no_intercept(syscall_number);
+            *result = syscall_no_intercept_wrapper(syscall_number);
 
             if(*result >= 0) {
                 *result = CTX->register_internal_fd(*result);
@@ -209,8 +177,8 @@ hook_internal(long syscall_number, long arg0, long arg1, long arg2, long arg3,
             break;
 
         case SYS_inotify_init1:
-            *result = syscall_no_intercept(syscall_number,
-                                           static_cast<int>(arg0));
+            *result = syscall_no_intercept_wrapper(syscall_number,
+                                                   static_cast<int>(arg0));
 
             if(*result >= 0) {
                 *result = CTX->register_internal_fd(*result);
@@ -219,7 +187,7 @@ hook_internal(long syscall_number, long arg0, long arg1, long arg2, long arg3,
             break;
 
         case SYS_perf_event_open:
-            *result = syscall_no_intercept(
+            *result = syscall_no_intercept_wrapper(
                     syscall_number,
                     reinterpret_cast<struct perf_event_attr*>(arg0),
                     static_cast<pid_t>(arg1), static_cast<int>(arg2),
@@ -231,7 +199,7 @@ hook_internal(long syscall_number, long arg0, long arg1, long arg2, long arg3,
             break;
 
         case SYS_signalfd:
-            *result = syscall_no_intercept(
+            *result = syscall_no_intercept_wrapper(
                     syscall_number, static_cast<int>(arg0),
                     reinterpret_cast<const sigset_t*>(arg1));
 
@@ -241,7 +209,7 @@ hook_internal(long syscall_number, long arg0, long arg1, long arg2, long arg3,
             break;
 
         case SYS_signalfd4:
-            *result = syscall_no_intercept(
+            *result = syscall_no_intercept_wrapper(
                     syscall_number, static_cast<int>(arg0),
                     reinterpret_cast<const sigset_t*>(arg1),
                     static_cast<int>(arg2));
@@ -252,9 +220,9 @@ hook_internal(long syscall_number, long arg0, long arg1, long arg2, long arg3,
             break;
 
         case SYS_timerfd_create:
-            *result =
-                    syscall_no_intercept(syscall_number, static_cast<int>(arg0),
-                                         static_cast<int>(arg1));
+            *result = syscall_no_intercept_wrapper(syscall_number,
+                                                   static_cast<int>(arg0),
+                                                   static_cast<int>(arg1));
 
             if(*result >= 0) {
                 *result = CTX->register_internal_fd(*result);
@@ -263,7 +231,7 @@ hook_internal(long syscall_number, long arg0, long arg1, long arg2, long arg3,
 
 
         case SYS_socket:
-            *result = syscall_no_intercept(
+            *result = syscall_no_intercept_wrapper(
                     syscall_number, static_cast<int>(arg0),
                     static_cast<int>(arg1), static_cast<int>(arg2));
 
@@ -274,7 +242,7 @@ hook_internal(long syscall_number, long arg0, long arg1, long arg2, long arg3,
 
         case SYS_socketpair:
 
-            *result = syscall_no_intercept(
+            *result = syscall_no_intercept_wrapper(
                     syscall_number, static_cast<int>(arg0),
                     static_cast<int>(arg1), static_cast<int>(arg2),
                     reinterpret_cast<int*>(arg3));
@@ -289,8 +257,8 @@ hook_internal(long syscall_number, long arg0, long arg1, long arg2, long arg3,
             break;
 
         case SYS_pipe:
-            *result = syscall_no_intercept(syscall_number,
-                                           reinterpret_cast<int*>(arg0));
+            *result = syscall_no_intercept_wrapper(
+                    syscall_number, reinterpret_cast<int*>(arg0));
 
             if(*result >= 0) {
                 reinterpret_cast<int*>(arg0)[0] = CTX->register_internal_fd(
@@ -303,9 +271,9 @@ hook_internal(long syscall_number, long arg0, long arg1, long arg2, long arg3,
 
         case SYS_pipe2:
 
-            *result = syscall_no_intercept(syscall_number,
-                                           reinterpret_cast<int*>(arg0),
-                                           static_cast<int>(arg1));
+            *result = syscall_no_intercept_wrapper(syscall_number,
+                                                   reinterpret_cast<int*>(arg0),
+                                                   static_cast<int>(arg1));
             if(*result >= 0) {
                 reinterpret_cast<int*>(arg0)[0] = CTX->register_internal_fd(
                         reinterpret_cast<int*>(arg0)[0]);
@@ -317,8 +285,8 @@ hook_internal(long syscall_number, long arg0, long arg1, long arg2, long arg3,
 
         case SYS_eventfd:
 
-            *result = syscall_no_intercept(syscall_number,
-                                           static_cast<int>(arg0));
+            *result = syscall_no_intercept_wrapper(syscall_number,
+                                                   static_cast<int>(arg0));
 
             if(*result >= 0) {
                 *result = CTX->register_internal_fd(*result);
@@ -327,9 +295,9 @@ hook_internal(long syscall_number, long arg0, long arg1, long arg2, long arg3,
 
         case SYS_eventfd2:
 
-            *result =
-                    syscall_no_intercept(syscall_number, static_cast<int>(arg0),
-                                         static_cast<int>(arg1));
+            *result = syscall_no_intercept_wrapper(syscall_number,
+                                                   static_cast<int>(arg0),
+                                                   static_cast<int>(arg1));
 
             if(*result >= 0) {
                 *result = CTX->register_internal_fd(*result);
@@ -337,10 +305,10 @@ hook_internal(long syscall_number, long arg0, long arg1, long arg2, long arg3,
             break;
 
         case SYS_recvmsg: {
-            *result =
-                    syscall_no_intercept(syscall_number, static_cast<int>(arg0),
-                                         reinterpret_cast<struct msghdr*>(arg1),
-                                         static_cast<int>(arg2));
+            *result = syscall_no_intercept_wrapper(
+                    syscall_number, static_cast<int>(arg0),
+                    reinterpret_cast<struct msghdr*>(arg1),
+                    static_cast<int>(arg2));
 
             // The recvmsg() syscall can receive file descriptors from another
             // process that the kernel automatically adds to the client's fds
@@ -377,7 +345,7 @@ hook_internal(long syscall_number, long arg0, long arg1, long arg2, long arg3,
         }
 
         case SYS_accept:
-            *result = syscall_no_intercept(
+            *result = syscall_no_intercept_wrapper(
                     syscall_number, static_cast<int>(arg0),
                     reinterpret_cast<struct sockaddr*>(arg1),
                     reinterpret_cast<int*>(arg2));
@@ -387,13 +355,24 @@ hook_internal(long syscall_number, long arg0, long arg1, long arg2, long arg3,
             }
             break;
 
+        case SYS_accept4:
+            *result = syscall_no_intercept_wrapper(
+                    syscall_number, static_cast<int>(arg0),
+                    reinterpret_cast<struct sockaddr*>(arg1),
+                    reinterpret_cast<int*>(arg2), static_cast<int>(arg3));
+
+            if(*result >= 0) {
+                *result = CTX->register_internal_fd(*result);
+            }
+            break;
+
+
         case SYS_fcntl:
-            *result =
-                    syscall_no_intercept(syscall_number, static_cast<int>(arg0),
-                                         static_cast<int>(arg1), arg2);
-            syserror = syscall_error_code(*result);
+            *result = syscall_no_intercept_wrapper(
+                    syscall_number, static_cast<int>(arg0),
+                    static_cast<int>(arg1), arg2);
 
-            if(syserror == 0) {
+            if(*result >= 0) {
 
 
                 if((static_cast<int>(arg1) == F_DUPFD ||
@@ -404,11 +383,9 @@ hook_internal(long syscall_number, long arg0, long arg1, long arg2, long arg3,
             break;
 
         case SYS_close:
-            *result = syscall_no_intercept(syscall_number,
-                                           static_cast<int>(arg0));
-            syserror = syscall_error_code(*result);
-
-            if(syserror == 0) {
+            *result = syscall_no_intercept_wrapper(syscall_number,
+                                                   static_cast<int>(arg0));
+            if(*result >= 0) {
                 CTX->unregister_internal_fd(arg0);
             }
             break;
@@ -453,7 +430,7 @@ hook(long syscall_number, long arg0, long arg1, long arg2, long arg3, long arg4,
     switch(syscall_number) {
 
         case SYS_execve:
-            *result = syscall_no_intercept(
+            *result = syscall_no_intercept_wrapper(
                     syscall_number, reinterpret_cast<const char*>(arg0),
                     reinterpret_cast<const char* const*>(arg1),
                     reinterpret_cast<const char* const*>(arg2));
@@ -461,7 +438,7 @@ hook(long syscall_number, long arg0, long arg1, long arg2, long arg3, long arg4,
 
 #ifdef SYS_execveat
         case SYS_execveat:
-            *result = syscall_no_intercept(
+            *result = syscall_no_intercept_wrapper(
                     syscall_number, arg0, reinterpret_cast<const char*>(arg1),
                     reinterpret_cast<const char* const*>(arg2),
                     reinterpret_cast<const char* const*>(arg3), arg4);
@@ -806,36 +783,28 @@ long
 socketcall_wrapper(long syscall_number, long& arg0, long& arg1, long& arg2,
                    long& arg3, long& arg4, long& arg5) {
 
-    if(syscall_number == SYS_socketcall) {
-        switch(static_cast<int>(arg0)) {
-            case 1:
-                syscall_number = SYS_socket;
-                break;
-            case 4:
-                syscall_number = SYS_listen;
-                break;
-            case 5:
-                syscall_number = SYS_accept;
-                break;
-            case 8:
-                syscall_number = SYS_socketpair;
-                break;
-            case 13:
-                syscall_number = SYS_shutdown;
-                break;
-            case 17:
-                syscall_number = SYS_recvmsg;
-                break;
-            case 18:
-                syscall_number = SYS_accept4;
-                break;
-            case 19:
-                syscall_number = SYS_recvmmsg;
-                break;
-            default:
-                break;
-        }
+    switch(static_cast<int>(arg0)) {
+        case 1:
+            syscall_number = SYS_socket;
+            break;
+        case 5:
+            syscall_number = SYS_accept;
+            break;
 
+        case 17:
+            syscall_number = SYS_recvmsg;
+            break;
+        case 18:
+            syscall_number = SYS_accept4;
+            break;
+        case 19:
+            syscall_number = SYS_recvmmsg;
+            break;
+
+        default:
+            break;
+    }
+    if(syscall_number != SYS_socketcall) {
         long int* parameters = (long int*) arg1;
         arg0 = static_cast<long>(*parameters);
         parameters++;
@@ -846,7 +815,10 @@ socketcall_wrapper(long syscall_number, long& arg0, long& arg1, long& arg2,
         arg3 = static_cast<long>(*parameters);
         parameters++;
         arg4 = static_cast<long>(*parameters);
+        parameters++;
+        arg5 = static_cast<long>(*parameters);
     }
+
     return syscall_number;
 }
 #endif
@@ -935,10 +907,8 @@ internal_hook_guard_wrapper(long syscall_number, long arg0, long arg1,
     int was_hooked = 0;
 
     reentrance_guard_flag = true;
-    int oerrno = errno;
     was_hooked = hook_internal(syscall_number, arg0, arg1, arg2, arg3, arg4,
                                arg5, syscall_return_value);
-    errno = oerrno;
     reentrance_guard_flag = false;
 
     return was_hooked;
@@ -975,18 +945,17 @@ hook_guard_wrapper(long syscall_number, long arg0, long arg1, long arg2,
     int was_hooked = 0;
 
     if(reentrance_guard_flag) {
-        int oerrno = errno;
+
         was_hooked = hook_internal(syscall_number, arg0, arg1, arg2, arg3, arg4,
                                    arg5, syscall_return_value);
-        errno = oerrno;
         return was_hooked;
     }
 
     reentrance_guard_flag = true;
-    int oerrno = errno;
+
     was_hooked = ::hook(syscall_number, arg0, arg1, arg2, arg3, arg4, arg5,
                         syscall_return_value);
-    errno = oerrno;
+
     reentrance_guard_flag = false;
 
     return was_hooked;
diff --git a/tests/integration/harness/gkfs.io/syscall_coverage.cpp b/tests/integration/harness/gkfs.io/syscall_coverage.cpp
index 4d5092d34ce5f473eda88fa5f61a96dba67dd6d7..ddb25cf5dc896f9cb0a6844fad30ad474c5e3567 100644
--- a/tests/integration/harness/gkfs.io/syscall_coverage.cpp
+++ b/tests/integration/harness/gkfs.io/syscall_coverage.cpp
@@ -399,7 +399,7 @@ syscall_coverage_exec(const syscall_coverage_options& opts) {
 
     // sys_unlinkat
     rv = ::syscall(SYS_unlinkat, AT_FDCWD, opts.pathname.c_str(), 0);
-    if(errno != ENOTSUP) {
+    if(rv < 0) {
         output("sys_unlinkat", rv, opts);
         return;
     }
diff --git a/tests/scripts/compile_dep.sh/0.9.1/p9.out b/tests/scripts/compile_dep.sh/0.9.1/p9.out
new file mode 100644
index 0000000000000000000000000000000000000000..7138da9e21f4b03645a9cfe0ff07bb66276ca00a
--- /dev/null
+++ b/tests/scripts/compile_dep.sh/0.9.1/p9.out
@@ -0,0 +1,12 @@
+######## Installing:  lz4 ###############################
+######## Installing:  capstone ###############################
+######## Installing:  json-c ###############################
+######## Installing:  psm2 ###############################
+WARNING: Install script for 'psm2' not found. Skipping.
+######## Installing:  libfabric ###############################
+######## Installing:  mercury ###############################
+######## Installing:  argobots ###############################
+######## Installing:  margo ###############################
+######## Installing:  rocksdb ###############################
+######## Installing:  syscall_intercept ###############################
+######## Installing:  date ###############################
diff --git a/tests/scripts/compile_dep.sh/0.9.2/p9.out b/tests/scripts/compile_dep.sh/0.9.2/p9.out
new file mode 100644
index 0000000000000000000000000000000000000000..7138da9e21f4b03645a9cfe0ff07bb66276ca00a
--- /dev/null
+++ b/tests/scripts/compile_dep.sh/0.9.2/p9.out
@@ -0,0 +1,12 @@
+######## Installing:  lz4 ###############################
+######## Installing:  capstone ###############################
+######## Installing:  json-c ###############################
+######## Installing:  psm2 ###############################
+WARNING: Install script for 'psm2' not found. Skipping.
+######## Installing:  libfabric ###############################
+######## Installing:  mercury ###############################
+######## Installing:  argobots ###############################
+######## Installing:  margo ###############################
+######## Installing:  rocksdb ###############################
+######## Installing:  syscall_intercept ###############################
+######## Installing:  date ###############################
diff --git a/tests/scripts/dl_dep.sh/0.8.0/all.out b/tests/scripts/dl_dep.sh/0.8.0/all.out
index d850f24468630bbf1e6c4babfec585f386695697..d6dad2fe561d22f97ac3709998d54884dc171e10 100644
--- a/tests/scripts/dl_dep.sh/0.8.0/all.out
+++ b/tests/scripts/dl_dep.sh/0.8.0/all.out
@@ -8,7 +8,7 @@ Downloaded 'https://github.com/lz4/lz4/archive/v1.8.0.tar.gz' to 'lz4'
 Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[41caa143a07ed179a3149cac4af0dc7aa3f946fd]' and flags '--recurse-submodules'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.6.3]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v6.2.2.tar.gz' to 'rocksdb'
-Cloned 'https://github.com/pmem/syscall_intercept.git' to 'syscall_intercept' with commit '[f7cebb7b7e7512a19b78a31ce236ad6ca22636dd]' and flags ''
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[f7cebb7b7e7512a19b78a31ce236ad6ca22636dd]' and flags ''
 Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags ''
 Cloned 'https://github.com/francielizanon/agios.git' to 'agios' with commit '[c26a6544200f823ebb8f890dd94e653d148bf226]' and flags '--branch=development'
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.0rc1.tar.gz' to 'argobots'
diff --git a/tests/scripts/dl_dep.sh/0.8.0/ci.out b/tests/scripts/dl_dep.sh/0.8.0/ci.out
index 1201cd8d0069b3b50b3f53cd6c15a4e7728b0ab1..fafcf2c1373cf0fcc36122e27872bbeef5ce9f1e 100644
--- a/tests/scripts/dl_dep.sh/0.8.0/ci.out
+++ b/tests/scripts/dl_dep.sh/0.8.0/ci.out
@@ -3,6 +3,6 @@ Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[41caa
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.0rc1.tar.gz' to 'argobots'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.6.3]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v6.2.2.tar.gz' to 'rocksdb'
-Cloned 'https://github.com/pmem/syscall_intercept.git' to 'syscall_intercept' with commit '[f7cebb7b7e7512a19b78a31ce236ad6ca22636dd]' and flags ''
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[f7cebb7b7e7512a19b78a31ce236ad6ca22636dd]' and flags ''
 Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags ''
 Cloned 'https://github.com/francielizanon/agios.git' to 'agios' with commit '[c26a6544200f823ebb8f890dd94e653d148bf226]' and flags '--branch=development'
diff --git a/tests/scripts/dl_dep.sh/0.8.0/default.out b/tests/scripts/dl_dep.sh/0.8.0/default.out
index 4becf9e5a2bb58b052cc36555e24a4f49b029364..7ba8e6778a49f2f7ebaf516c6143f2dd095adef8 100644
--- a/tests/scripts/dl_dep.sh/0.8.0/default.out
+++ b/tests/scripts/dl_dep.sh/0.8.0/default.out
@@ -10,7 +10,7 @@ Downloaded 'https://github.com/pmodels/argobots/archive/v1.0rc1.tar.gz' to 'argo
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.6.3]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v6.2.2.tar.gz' to 'rocksdb'
 Downloaded 'https://github.com/facebook/rocksdb/archive/v6.11.4.tar.gz' to 'rocksdb%experimental'
-Cloned 'https://github.com/pmem/syscall_intercept.git' to 'syscall_intercept' with commit '[f7cebb7b7e7512a19b78a31ce236ad6ca22636dd]' and flags ''
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[f7cebb7b7e7512a19b78a31ce236ad6ca22636dd]' and flags ''
 Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags ''
 Downloaded 'https://github.com/intel/opa-psm2/archive/PSM2_11.2.86.tar.gz' to 'psm2'
 Cloned 'https://github.com/francielizanon/agios.git' to 'agios' with commit '[c26a6544200f823ebb8f890dd94e653d148bf226]' and flags '--branch=development'
diff --git a/tests/scripts/dl_dep.sh/0.8.0/direct.out b/tests/scripts/dl_dep.sh/0.8.0/direct.out
index ae5b719cc40fb7510f08c036701689fe52306a4b..2756196febc9a6da39402ad1954f59d76b340784 100644
--- a/tests/scripts/dl_dep.sh/0.8.0/direct.out
+++ b/tests/scripts/dl_dep.sh/0.8.0/direct.out
@@ -2,5 +2,5 @@ Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[41caa
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.0rc1.tar.gz' to 'argobots'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.6.3]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v6.2.2.tar.gz' to 'rocksdb'
-Cloned 'https://github.com/pmem/syscall_intercept.git' to 'syscall_intercept' with commit '[f7cebb7b7e7512a19b78a31ce236ad6ca22636dd]' and flags ''
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[f7cebb7b7e7512a19b78a31ce236ad6ca22636dd]' and flags ''
 Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags ''
diff --git a/tests/scripts/dl_dep.sh/0.8.0/mogon1.out b/tests/scripts/dl_dep.sh/0.8.0/mogon1.out
index d1c89a1e8e5dc6bc6ae88fdacabd0616f0aaf48b..6f65393c3b9d5650a1b68e5814f0fd2294905e60 100644
--- a/tests/scripts/dl_dep.sh/0.8.0/mogon1.out
+++ b/tests/scripts/dl_dep.sh/0.8.0/mogon1.out
@@ -7,5 +7,5 @@ Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[41caa
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.0rc1.tar.gz' to 'argobots'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.6.3]' and flags ''
 Cloned 'https://github.com/facebook/rocksdb/archive/v6.2.2.tar.gz' to 'rocksdb' with commit '[6.2.2]' and flags ''
-Cloned 'https://github.com/pmem/syscall_intercept.git' to 'syscall_intercept' with commit '[f7cebb7b7e7512a19b78a31ce236ad6ca22636dd]' and flags ''
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[f7cebb7b7e7512a19b78a31ce236ad6ca22636dd]' and flags ''
 Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags ''
diff --git a/tests/scripts/dl_dep.sh/0.8.0/mogon2.out b/tests/scripts/dl_dep.sh/0.8.0/mogon2.out
index c333271f8f41c26a585fe550b9f0d69123fd0432..d8af0a79b2bed070d64eb40b2751a06fd5040207 100644
--- a/tests/scripts/dl_dep.sh/0.8.0/mogon2.out
+++ b/tests/scripts/dl_dep.sh/0.8.0/mogon2.out
@@ -8,6 +8,6 @@ Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[41caa
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.0rc1.tar.gz' to 'argobots'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.6.3]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v6.11.4.tar.gz' to 'rocksdb%experimental'
-Cloned 'https://github.com/pmem/syscall_intercept.git' to 'syscall_intercept' with commit '[f7cebb7b7e7512a19b78a31ce236ad6ca22636dd]' and flags ''
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[f7cebb7b7e7512a19b78a31ce236ad6ca22636dd]' and flags ''
 Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags ''
 Downloaded 'https://github.com/intel/opa-psm2/archive/PSM2_11.2.86.tar.gz' to 'psm2'
diff --git a/tests/scripts/dl_dep.sh/0.8.0/ngio.out b/tests/scripts/dl_dep.sh/0.8.0/ngio.out
index 87f062d199f1a9c1111ebf2f76ee41897905b03f..f0c9f79592b10c1307d92dbafc560a5914c5974d 100644
--- a/tests/scripts/dl_dep.sh/0.8.0/ngio.out
+++ b/tests/scripts/dl_dep.sh/0.8.0/ngio.out
@@ -7,7 +7,7 @@ Downloaded 'https://github.com/pmodels/argobots/archive/v1.0rc1.tar.gz' to 'argo
 Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[41caa143a07ed179a3149cac4af0dc7aa3f946fd]' and flags '--recurse-submodules'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.6.3]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v6.2.2.tar.gz' to 'rocksdb'
-Cloned 'https://github.com/pmem/syscall_intercept.git' to 'syscall_intercept' with commit '[f7cebb7b7e7512a19b78a31ce236ad6ca22636dd]' and flags ''
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[f7cebb7b7e7512a19b78a31ce236ad6ca22636dd]' and flags ''
 Downloaded 'https://github.com/intel/opa-psm2/archive/PSM2_11.2.86.tar.gz' to 'psm2'
 Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags ''
 Cloned 'https://github.com/francielizanon/agios.git' to 'agios' with commit '[c26a6544200f823ebb8f890dd94e653d148bf226]' and flags '--branch=development'
diff --git a/tests/scripts/dl_dep.sh/0.9.0/agios.out b/tests/scripts/dl_dep.sh/0.9.0/agios.out
index 07bf82bac2c7eb153bfaef8bc0496d280a83b025..12521d0db9dda0dc7ef6b18e08a1e7c297011107 100644
--- a/tests/scripts/dl_dep.sh/0.9.0/agios.out
+++ b/tests/scripts/dl_dep.sh/0.9.0/agios.out
@@ -6,7 +6,7 @@ Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.9.6]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v6.26.1.tar.gz' to 'rocksdb'
-Cloned 'https://github.com/pmem/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
 Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags ''
 Cloned 'https://github.com/francielizanon/agios.git' to 'agios' with commit '[c26a6544200f823ebb8f890dd94e653d148bf226]' and flags '--branch=development'
-Done
\ No newline at end of file
+Done
diff --git a/tests/scripts/dl_dep.sh/0.9.0/ci.out b/tests/scripts/dl_dep.sh/0.9.0/ci.out
index e9550114d7e2274072f87f8caefae35560273ad3..78584a6830b05e2c40759bd36b194ad4f0e54b87 100644
--- a/tests/scripts/dl_dep.sh/0.9.0/ci.out
+++ b/tests/scripts/dl_dep.sh/0.9.0/ci.out
@@ -3,7 +3,7 @@ Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.9.6]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v6.26.1.tar.gz' to 'rocksdb'
-Cloned 'https://github.com/pmem/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
 Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags ''
 Cloned 'https://github.com/francielizanon/agios.git' to 'agios' with commit '[c26a6544200f823ebb8f890dd94e653d148bf226]' and flags '--branch=development'
-Done
\ No newline at end of file
+Done
diff --git a/tests/scripts/dl_dep.sh/0.9.0/default.out b/tests/scripts/dl_dep.sh/0.9.0/default.out
index 7c047de89939362fcceb01308271a229d798389c..e0fb612d097cfbaf802262d234a65154a0566eb7 100644
--- a/tests/scripts/dl_dep.sh/0.9.0/default.out
+++ b/tests/scripts/dl_dep.sh/0.9.0/default.out
@@ -6,6 +6,6 @@ Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.9.6]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v6.26.1.tar.gz' to 'rocksdb'
-Cloned 'https://github.com/pmem/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
 Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags ''
-Done
\ No newline at end of file
+Done
diff --git a/tests/scripts/dl_dep.sh/0.9.0/direct.out b/tests/scripts/dl_dep.sh/0.9.0/direct.out
index 42b3335768596af57f653b2409cd51492c3fb0b5..6adf78a546726e7ee555703fb03e0adc86588b52 100644
--- a/tests/scripts/dl_dep.sh/0.9.0/direct.out
+++ b/tests/scripts/dl_dep.sh/0.9.0/direct.out
@@ -3,5 +3,5 @@ Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.9.6]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v6.26.1.tar.gz' to 'rocksdb'
-Cloned 'https://github.com/pmem/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
-Done
\ No newline at end of file
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
+Done
diff --git a/tests/scripts/dl_dep.sh/0.9.0/infiniband_verbs.out b/tests/scripts/dl_dep.sh/0.9.0/infiniband_verbs.out
index da3c3e52c97232c28d407379a31c34bd217e167e..840bebb7fc3bd552fe764d453251a80c3973bcc5 100644
--- a/tests/scripts/dl_dep.sh/0.9.0/infiniband_verbs.out
+++ b/tests/scripts/dl_dep.sh/0.9.0/infiniband_verbs.out
@@ -6,6 +6,6 @@ Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.9.6]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v6.26.1.tar.gz' to 'rocksdb'
-Cloned 'https://github.com/pmem/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
 Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags ''
-Done
\ No newline at end of file
+Done
diff --git a/tests/scripts/dl_dep.sh/0.9.0/marenostrum4.out b/tests/scripts/dl_dep.sh/0.9.0/marenostrum4.out
index b4f4e9c0ea4b6bbb21148e1a1d4cec9c771c856c..e76b1788216666548e599631b3485b7348908203 100644
--- a/tests/scripts/dl_dep.sh/0.9.0/marenostrum4.out
+++ b/tests/scripts/dl_dep.sh/0.9.0/marenostrum4.out
@@ -7,6 +7,6 @@ Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.9.6]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v6.26.1.tar.gz' to 'rocksdb'
-Cloned 'https://github.com/pmem/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
 Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags ''
-Done
\ No newline at end of file
+Done
diff --git a/tests/scripts/dl_dep.sh/0.9.0/mogon2.out b/tests/scripts/dl_dep.sh/0.9.0/mogon2.out
index b4f4e9c0ea4b6bbb21148e1a1d4cec9c771c856c..e76b1788216666548e599631b3485b7348908203 100644
--- a/tests/scripts/dl_dep.sh/0.9.0/mogon2.out
+++ b/tests/scripts/dl_dep.sh/0.9.0/mogon2.out
@@ -7,6 +7,6 @@ Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.9.6]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v6.26.1.tar.gz' to 'rocksdb'
-Cloned 'https://github.com/pmem/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
 Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags ''
-Done
\ No newline at end of file
+Done
diff --git a/tests/scripts/dl_dep.sh/0.9.0/ngio.out b/tests/scripts/dl_dep.sh/0.9.0/ngio.out
index b4f4e9c0ea4b6bbb21148e1a1d4cec9c771c856c..e76b1788216666548e599631b3485b7348908203 100644
--- a/tests/scripts/dl_dep.sh/0.9.0/ngio.out
+++ b/tests/scripts/dl_dep.sh/0.9.0/ngio.out
@@ -7,6 +7,6 @@ Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.9.6]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v6.26.1.tar.gz' to 'rocksdb'
-Cloned 'https://github.com/pmem/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
 Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags ''
-Done
\ No newline at end of file
+Done
diff --git a/tests/scripts/dl_dep.sh/0.9.0/omnipath_psm2.out b/tests/scripts/dl_dep.sh/0.9.0/omnipath_psm2.out
index b4f4e9c0ea4b6bbb21148e1a1d4cec9c771c856c..e76b1788216666548e599631b3485b7348908203 100644
--- a/tests/scripts/dl_dep.sh/0.9.0/omnipath_psm2.out
+++ b/tests/scripts/dl_dep.sh/0.9.0/omnipath_psm2.out
@@ -7,6 +7,6 @@ Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.9.6]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v6.26.1.tar.gz' to 'rocksdb'
-Cloned 'https://github.com/pmem/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
 Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags ''
-Done
\ No newline at end of file
+Done
diff --git a/tests/scripts/dl_dep.sh/0.9.1/agios.out b/tests/scripts/dl_dep.sh/0.9.1/agios.out
index 07bf82bac2c7eb153bfaef8bc0496d280a83b025..12521d0db9dda0dc7ef6b18e08a1e7c297011107 100644
--- a/tests/scripts/dl_dep.sh/0.9.1/agios.out
+++ b/tests/scripts/dl_dep.sh/0.9.1/agios.out
@@ -6,7 +6,7 @@ Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.9.6]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v6.26.1.tar.gz' to 'rocksdb'
-Cloned 'https://github.com/pmem/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
 Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags ''
 Cloned 'https://github.com/francielizanon/agios.git' to 'agios' with commit '[c26a6544200f823ebb8f890dd94e653d148bf226]' and flags '--branch=development'
-Done
\ No newline at end of file
+Done
diff --git a/tests/scripts/dl_dep.sh/0.9.1/all.out b/tests/scripts/dl_dep.sh/0.9.1/all.out
index f6ddad01822139e754348a3fbc0ca6734c8d9d8d..35b6b521748a2bb789559c4df780c438d345b7b8 100644
--- a/tests/scripts/dl_dep.sh/0.9.1/all.out
+++ b/tests/scripts/dl_dep.sh/0.9.1/all.out
@@ -7,8 +7,8 @@ Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.9.6]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v6.26.1.tar.gz' to 'rocksdb'
-Cloned 'https://github.com/pmem/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
 Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags ''
 Cloned 'https://github.com/francielizanon/agios.git' to 'agios' with commit '[c26a6544200f823ebb8f890dd94e653d148bf226]' and flags '--branch=development'
 Cloned 'https://github.com/CARV-ICS-FORTH/parallax.git' to 'parallax' with commit '[c130decd7a71c60c20b98d6a23924f05f754c3cd]' and flags ''
-Done
\ No newline at end of file
+Done
diff --git a/tests/scripts/dl_dep.sh/0.9.1/ci.out b/tests/scripts/dl_dep.sh/0.9.1/ci.out
index aa2acc0cd8b9bd43f2d05948a348fde1f68e119b..d7a33b8a746e87f222bc488ba7c3bd53487c5df7 100644
--- a/tests/scripts/dl_dep.sh/0.9.1/ci.out
+++ b/tests/scripts/dl_dep.sh/0.9.1/ci.out
@@ -3,8 +3,8 @@ Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.9.6]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v6.26.1.tar.gz' to 'rocksdb'
-Cloned 'https://github.com/pmem/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
 Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags ''
 Cloned 'https://github.com/francielizanon/agios.git' to 'agios' with commit '[c26a6544200f823ebb8f890dd94e653d148bf226]' and flags '--branch=development'
 Cloned 'https://github.com/CARV-ICS-FORTH/parallax.git' to 'parallax' with commit '[c130decd7a71c60c20b98d6a23924f05f754c3cd]' and flags ''
-Done
\ No newline at end of file
+Done
diff --git a/tests/scripts/dl_dep.sh/0.9.1/default.out b/tests/scripts/dl_dep.sh/0.9.1/default.out
index 7c047de89939362fcceb01308271a229d798389c..e0fb612d097cfbaf802262d234a65154a0566eb7 100644
--- a/tests/scripts/dl_dep.sh/0.9.1/default.out
+++ b/tests/scripts/dl_dep.sh/0.9.1/default.out
@@ -6,6 +6,6 @@ Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.9.6]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v6.26.1.tar.gz' to 'rocksdb'
-Cloned 'https://github.com/pmem/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
 Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags ''
-Done
\ No newline at end of file
+Done
diff --git a/tests/scripts/dl_dep.sh/0.9.1/direct.out b/tests/scripts/dl_dep.sh/0.9.1/direct.out
index 42b3335768596af57f653b2409cd51492c3fb0b5..6adf78a546726e7ee555703fb03e0adc86588b52 100644
--- a/tests/scripts/dl_dep.sh/0.9.1/direct.out
+++ b/tests/scripts/dl_dep.sh/0.9.1/direct.out
@@ -3,5 +3,5 @@ Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.9.6]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v6.26.1.tar.gz' to 'rocksdb'
-Cloned 'https://github.com/pmem/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
-Done
\ No newline at end of file
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
+Done
diff --git a/tests/scripts/dl_dep.sh/0.9.1/infiniband_verbs.out b/tests/scripts/dl_dep.sh/0.9.1/infiniband_verbs.out
index da3c3e52c97232c28d407379a31c34bd217e167e..840bebb7fc3bd552fe764d453251a80c3973bcc5 100644
--- a/tests/scripts/dl_dep.sh/0.9.1/infiniband_verbs.out
+++ b/tests/scripts/dl_dep.sh/0.9.1/infiniband_verbs.out
@@ -6,6 +6,6 @@ Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.9.6]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v6.26.1.tar.gz' to 'rocksdb'
-Cloned 'https://github.com/pmem/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
 Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags ''
-Done
\ No newline at end of file
+Done
diff --git a/tests/scripts/dl_dep.sh/0.9.1/marenostrum4.out b/tests/scripts/dl_dep.sh/0.9.1/marenostrum4.out
index 1d4ad26f5aab87331a48265a2b749c5f64f5c2e8..5185b0db8b3c3db0f8b07d19e7b32294dd9f5f69 100644
--- a/tests/scripts/dl_dep.sh/0.9.1/marenostrum4.out
+++ b/tests/scripts/dl_dep.sh/0.9.1/marenostrum4.out
@@ -7,7 +7,7 @@ Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.9.6]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v6.26.1.tar.gz' to 'rocksdb'
-Cloned 'https://github.com/pmem/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
 Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags ''
 Cloned 'https://github.com/CARV-ICS-FORTH/parallax.git' to 'parallax' with commit '[c130decd7a71c60c20b98d6a23924f05f754c3cd]' and flags ''
-Done
\ No newline at end of file
+Done
diff --git a/tests/scripts/dl_dep.sh/0.9.1/mogon2.out b/tests/scripts/dl_dep.sh/0.9.1/mogon2.out
index 1d4ad26f5aab87331a48265a2b749c5f64f5c2e8..5185b0db8b3c3db0f8b07d19e7b32294dd9f5f69 100644
--- a/tests/scripts/dl_dep.sh/0.9.1/mogon2.out
+++ b/tests/scripts/dl_dep.sh/0.9.1/mogon2.out
@@ -7,7 +7,7 @@ Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.9.6]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v6.26.1.tar.gz' to 'rocksdb'
-Cloned 'https://github.com/pmem/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
 Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags ''
 Cloned 'https://github.com/CARV-ICS-FORTH/parallax.git' to 'parallax' with commit '[c130decd7a71c60c20b98d6a23924f05f754c3cd]' and flags ''
-Done
\ No newline at end of file
+Done
diff --git a/tests/scripts/dl_dep.sh/0.9.1/ngio.out b/tests/scripts/dl_dep.sh/0.9.1/ngio.out
index 1d4ad26f5aab87331a48265a2b749c5f64f5c2e8..5185b0db8b3c3db0f8b07d19e7b32294dd9f5f69 100644
--- a/tests/scripts/dl_dep.sh/0.9.1/ngio.out
+++ b/tests/scripts/dl_dep.sh/0.9.1/ngio.out
@@ -7,7 +7,7 @@ Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.9.6]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v6.26.1.tar.gz' to 'rocksdb'
-Cloned 'https://github.com/pmem/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
 Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags ''
 Cloned 'https://github.com/CARV-ICS-FORTH/parallax.git' to 'parallax' with commit '[c130decd7a71c60c20b98d6a23924f05f754c3cd]' and flags ''
-Done
\ No newline at end of file
+Done
diff --git a/tests/scripts/dl_dep.sh/0.9.1/omnipath_psm2.out b/tests/scripts/dl_dep.sh/0.9.1/omnipath_psm2.out
index b4f4e9c0ea4b6bbb21148e1a1d4cec9c771c856c..e76b1788216666548e599631b3485b7348908203 100644
--- a/tests/scripts/dl_dep.sh/0.9.1/omnipath_psm2.out
+++ b/tests/scripts/dl_dep.sh/0.9.1/omnipath_psm2.out
@@ -7,6 +7,6 @@ Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.9.6]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v6.26.1.tar.gz' to 'rocksdb'
-Cloned 'https://github.com/pmem/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
 Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags ''
-Done
\ No newline at end of file
+Done
diff --git a/tests/scripts/dl_dep.sh/0.9.1/p9.out b/tests/scripts/dl_dep.sh/0.9.1/p9.out
new file mode 100644
index 0000000000000000000000000000000000000000..3a99bb523089fa9d7aaa1a36a4a62fa9d6295732
--- /dev/null
+++ b/tests/scripts/dl_dep.sh/0.9.1/p9.out
@@ -0,0 +1,12 @@
+Downloaded 'https://github.com/lz4/lz4/archive/v1.9.3.tar.gz' to 'lz4'
+Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone'
+Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.15-20200726.tar.gz' to 'json-c'
+Downloaded 'https://github.com/intel/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2'
+Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.13.2'
+Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.0]' and flags '--recurse-submodules'
+Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots'
+Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.9.6]' and flags ''
+Downloaded 'https://github.com/facebook/rocksdb/archive/v6.26.1.tar.gz' to 'rocksdb'
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[6eb27a9d2053bb2ac3bb9ce30e13b64ce055c19f]' and flags ''
+Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags ''
+Done
diff --git a/tests/scripts/dl_dep.sh/0.9.2/agios.out b/tests/scripts/dl_dep.sh/0.9.2/agios.out
index 07bf82bac2c7eb153bfaef8bc0496d280a83b025..bf5455ca27763dc18c29eaf971987d46b9a61e7f 100644
--- a/tests/scripts/dl_dep.sh/0.9.2/agios.out
+++ b/tests/scripts/dl_dep.sh/0.9.2/agios.out
@@ -6,7 +6,7 @@ Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.9.6]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v6.26.1.tar.gz' to 'rocksdb'
-Cloned 'https://github.com/pmem/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
 Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags ''
 Cloned 'https://github.com/francielizanon/agios.git' to 'agios' with commit '[c26a6544200f823ebb8f890dd94e653d148bf226]' and flags '--branch=development'
 Done
\ No newline at end of file
diff --git a/tests/scripts/dl_dep.sh/0.9.2/all.out b/tests/scripts/dl_dep.sh/0.9.2/all.out
index 04922981c17e39a99e054b30ced4bb8f67818600..4a1ab9e6f6de6a14f9e7da7c7792bd01e6171c48 100644
--- a/tests/scripts/dl_dep.sh/0.9.2/all.out
+++ b/tests/scripts/dl_dep.sh/0.9.2/all.out
@@ -7,7 +7,7 @@ Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.9.6]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v6.26.1.tar.gz' to 'rocksdb'
-Cloned 'https://github.com/pmem/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
 Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags ''
 Cloned 'https://github.com/francielizanon/agios.git' to 'agios' with commit '[c26a6544200f823ebb8f890dd94e653d148bf226]' and flags '--branch=development'
 Cloned 'https://github.com/CARV-ICS-FORTH/parallax.git' to 'parallax' with commit '[ffdea6e820f5c4c2d33e60d9a4b15ef9e6bbcfdd]' and flags ''
diff --git a/tests/scripts/dl_dep.sh/0.9.2/ci.out b/tests/scripts/dl_dep.sh/0.9.2/ci.out
index 860dcb245848309bd7335b79a6a44cef7f50c3a0..4ee089ef7a35040859946174aa99c82d790e6049 100644
--- a/tests/scripts/dl_dep.sh/0.9.2/ci.out
+++ b/tests/scripts/dl_dep.sh/0.9.2/ci.out
@@ -3,7 +3,7 @@ Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.9.6]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v6.26.1.tar.gz' to 'rocksdb'
-Cloned 'https://github.com/pmem/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
 Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags ''
 Cloned 'https://github.com/francielizanon/agios.git' to 'agios' with commit '[c26a6544200f823ebb8f890dd94e653d148bf226]' and flags '--branch=development'
 Cloned 'https://github.com/CARV-ICS-FORTH/parallax.git' to 'parallax' with commit '[ffdea6e820f5c4c2d33e60d9a4b15ef9e6bbcfdd]' and flags ''
diff --git a/tests/scripts/dl_dep.sh/0.9.2/default.out b/tests/scripts/dl_dep.sh/0.9.2/default.out
index 7c047de89939362fcceb01308271a229d798389c..a68701cf0564db9c2cf70246d63f8da9ffdc4f65 100644
--- a/tests/scripts/dl_dep.sh/0.9.2/default.out
+++ b/tests/scripts/dl_dep.sh/0.9.2/default.out
@@ -6,6 +6,6 @@ Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.9.6]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v6.26.1.tar.gz' to 'rocksdb'
-Cloned 'https://github.com/pmem/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
 Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags ''
 Done
\ No newline at end of file
diff --git a/tests/scripts/dl_dep.sh/0.9.2/direct.out b/tests/scripts/dl_dep.sh/0.9.2/direct.out
index 42b3335768596af57f653b2409cd51492c3fb0b5..e27eae530550700bd1de2bfa29823180c8ca551f 100644
--- a/tests/scripts/dl_dep.sh/0.9.2/direct.out
+++ b/tests/scripts/dl_dep.sh/0.9.2/direct.out
@@ -3,5 +3,5 @@ Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.9.6]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v6.26.1.tar.gz' to 'rocksdb'
-Cloned 'https://github.com/pmem/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
 Done
\ No newline at end of file
diff --git a/tests/scripts/dl_dep.sh/0.9.2/infiniband_verbs.out b/tests/scripts/dl_dep.sh/0.9.2/infiniband_verbs.out
index da3c3e52c97232c28d407379a31c34bd217e167e..6ebc289ff6e5a1ac087078ee33ca587d1a9a8627 100644
--- a/tests/scripts/dl_dep.sh/0.9.2/infiniband_verbs.out
+++ b/tests/scripts/dl_dep.sh/0.9.2/infiniband_verbs.out
@@ -6,6 +6,6 @@ Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.9.6]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v6.26.1.tar.gz' to 'rocksdb'
-Cloned 'https://github.com/pmem/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
 Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags ''
 Done
\ No newline at end of file
diff --git a/tests/scripts/dl_dep.sh/0.9.2/marenostrum4.out b/tests/scripts/dl_dep.sh/0.9.2/marenostrum4.out
index 1d4ad26f5aab87331a48265a2b749c5f64f5c2e8..657154fdc1ec4e756f29281558459fa9662bd83d 100644
--- a/tests/scripts/dl_dep.sh/0.9.2/marenostrum4.out
+++ b/tests/scripts/dl_dep.sh/0.9.2/marenostrum4.out
@@ -7,7 +7,7 @@ Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.9.6]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v6.26.1.tar.gz' to 'rocksdb'
-Cloned 'https://github.com/pmem/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
 Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags ''
 Cloned 'https://github.com/CARV-ICS-FORTH/parallax.git' to 'parallax' with commit '[c130decd7a71c60c20b98d6a23924f05f754c3cd]' and flags ''
 Done
\ No newline at end of file
diff --git a/tests/scripts/dl_dep.sh/0.9.2/mogon2.out b/tests/scripts/dl_dep.sh/0.9.2/mogon2.out
index 1d4ad26f5aab87331a48265a2b749c5f64f5c2e8..657154fdc1ec4e756f29281558459fa9662bd83d 100644
--- a/tests/scripts/dl_dep.sh/0.9.2/mogon2.out
+++ b/tests/scripts/dl_dep.sh/0.9.2/mogon2.out
@@ -7,7 +7,7 @@ Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.9.6]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v6.26.1.tar.gz' to 'rocksdb'
-Cloned 'https://github.com/pmem/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
 Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags ''
 Cloned 'https://github.com/CARV-ICS-FORTH/parallax.git' to 'parallax' with commit '[c130decd7a71c60c20b98d6a23924f05f754c3cd]' and flags ''
 Done
\ No newline at end of file
diff --git a/tests/scripts/dl_dep.sh/0.9.2/ngio.out b/tests/scripts/dl_dep.sh/0.9.2/ngio.out
index 1d4ad26f5aab87331a48265a2b749c5f64f5c2e8..657154fdc1ec4e756f29281558459fa9662bd83d 100644
--- a/tests/scripts/dl_dep.sh/0.9.2/ngio.out
+++ b/tests/scripts/dl_dep.sh/0.9.2/ngio.out
@@ -7,7 +7,7 @@ Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.9.6]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v6.26.1.tar.gz' to 'rocksdb'
-Cloned 'https://github.com/pmem/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
 Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags ''
 Cloned 'https://github.com/CARV-ICS-FORTH/parallax.git' to 'parallax' with commit '[c130decd7a71c60c20b98d6a23924f05f754c3cd]' and flags ''
 Done
\ No newline at end of file
diff --git a/tests/scripts/dl_dep.sh/0.9.2/omnipath_psm2.out b/tests/scripts/dl_dep.sh/0.9.2/omnipath_psm2.out
index b4f4e9c0ea4b6bbb21148e1a1d4cec9c771c856c..d26b498ca41977f2e48d86f1f0437c1bc0b7a563 100644
--- a/tests/scripts/dl_dep.sh/0.9.2/omnipath_psm2.out
+++ b/tests/scripts/dl_dep.sh/0.9.2/omnipath_psm2.out
@@ -7,6 +7,6 @@ Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.9.6]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v6.26.1.tar.gz' to 'rocksdb'
-Cloned 'https://github.com/pmem/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
 Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags ''
 Done
\ No newline at end of file
diff --git a/tests/scripts/dl_dep.sh/0.9.2/p9.out b/tests/scripts/dl_dep.sh/0.9.2/p9.out
new file mode 100644
index 0000000000000000000000000000000000000000..3a99bb523089fa9d7aaa1a36a4a62fa9d6295732
--- /dev/null
+++ b/tests/scripts/dl_dep.sh/0.9.2/p9.out
@@ -0,0 +1,12 @@
+Downloaded 'https://github.com/lz4/lz4/archive/v1.9.3.tar.gz' to 'lz4'
+Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone'
+Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.15-20200726.tar.gz' to 'json-c'
+Downloaded 'https://github.com/intel/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2'
+Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.13.2'
+Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.1.0]' and flags '--recurse-submodules'
+Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots'
+Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.9.6]' and flags ''
+Downloaded 'https://github.com/facebook/rocksdb/archive/v6.26.1.tar.gz' to 'rocksdb'
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[6eb27a9d2053bb2ac3bb9ce30e13b64ce055c19f]' and flags ''
+Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags ''
+Done