diff --git a/libkineto/CMakeLists.txt b/libkineto/CMakeLists.txt
index 67e7964da..75070ceaf 100644
--- a/libkineto/CMakeLists.txt
+++ b/libkineto/CMakeLists.txt
@@ -183,7 +183,6 @@ endif()
 
 set(DYNOLOG_INCLUDE_DIR "${LIBKINETO_THIRDPARTY_DIR}/dynolog/")
 set(IPCFABRIC_INCLUDE_DIR "${DYNOLOG_INCLUDE_DIR}/dynolog/src/ipcfabric/")
-add_subdirectory("${IPCFABRIC_INCLUDE_DIR}")
 
 if(NOT TARGET fmt::fmt-header-only)
   if(NOT FMT_SOURCE_DIR)
@@ -204,8 +203,6 @@ message(STATUS " ROCTRACER_INCLUDE_DIR = ${ROCTRACER_INCLUDE_DIR}")
 message(STATUS " DYNOLOG_INCLUDE_DIR = ${DYNOLOG_INCLUDE_DIR}")
 message(STATUS " IPCFABRIC_INCLUDE_DIR = ${IPCFABRIC_INCLUDE_DIR}")
 
-target_link_libraries(kineto_base PRIVATE dynolog_ipcfabric_lib)
-
 target_include_directories(kineto_base PUBLIC
       $<BUILD_INTERFACE:${LIBKINETO_INCLUDE_DIR}>
       $<BUILD_INTERFACE:${LIBKINETO_SOURCE_DIR}>
diff --git a/libkineto/test/PidInfoTest.cpp b/libkineto/test/PidInfoTest.cpp
index 1534bf8b0..7434fa9e2 100644
--- a/libkineto/test/PidInfoTest.cpp
+++ b/libkineto/test/PidInfoTest.cpp
@@ -8,8 +8,6 @@
 
 #include "include/ThreadUtil.h"
 
-#include <thread>
-
 #include <gtest/gtest.h>
 
 using namespace KINETO_NAMESPACE;
@@ -26,8 +24,13 @@ TEST(ThreadNameTest, setAndGet) {
   EXPECT_EQ(getThreadName(), "Name w/ spaces");
 
   // More than 16 chars is not OK
-#ifndef _WIN32
+#if defined(__APPLE__)
+  GTEST_EXPECT_TRUE(setThreadName("More than 16 characters"));
+  EXPECT_EQ(getThreadName(), "More than 16 ch");
+#else
+#if !defined(_WIN32)
   GTEST_EXPECT_FALSE(setThreadName("More than 16 characters"));
   EXPECT_EQ(getThreadName(), "Name w/ spaces");
 #endif
+#endif
 }