diff --git a/src/client/hooks.cpp b/src/client/hooks.cpp
index ea1d2d1898c653230f2fc693b47658b31038d4b0..70df599aa731da3c59eab0327f69092e5b15a7dd 100644
--- a/src/client/hooks.cpp
+++ b/src/client/hooks.cpp
@@ -711,7 +711,12 @@ hook_lchown(const char* path, uid_t owner, gid_t group) {
             __func__);
         return 0;
     }
+#ifdef SYS_lchown
     return syscall_no_intercept_wrapper(SYS_lchown, path, owner, group);
+#else
+    return syscall_no_intercept_wrapper(SYS_fchownat, AT_FDCWD, path, owner,
+                                        group, AT_SYMLINK_NOFOLLOW);
+#endif
 }
 
 int
@@ -725,7 +730,12 @@ hook_chown(const char* path, uid_t owner, gid_t group) {
             __func__);
         return 0;
     }
+#ifdef SYS_chown
     return syscall_no_intercept_wrapper(SYS_chown, path, owner, group);
+#else
+    return syscall_no_intercept_wrapper(SYS_fchownat, AT_FDCWD, path, owner,
+                                        group, 0);
+#endif
 }
 
 int
diff --git a/src/daemon/daemon.cpp b/src/daemon/daemon.cpp
index f286695b683080af32f9b695a34dbd28524acf45..b845ec0b5f96b322bdf72e242e6ec40c015a3443 100644
--- a/src/daemon/daemon.cpp
+++ b/src/daemon/daemon.cpp
@@ -237,7 +237,8 @@ void
 init_rpc_server() {
     // Thallium Init
     auto margo_config = fmt::format(
-            R"({{ "use_progress_thread" : true, "rpc_thread_count" : {} }})",
+            R"({{ "mercury": {{ "request_post_init": 2048 }}, 
+               "use_progress_thread" : true, "rpc_thread_count" : {} }})",
             gkfs::config::rpc::daemon_handler_xstreams);
 
     // We treat margo_config as the initialization string for Thallium engine