diff --git a/CMakeLists.txt b/CMakeLists.txt
index ccacac1c..1dbb007b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -285,8 +285,8 @@ if(USE_KUNLUN)
   message(STATUS "KUNLUN_HOME: ${KUNLUN_HOME}")
 
   include_directories("${KUNLUN_HOME}/include/")
-  find_library(KUNLUN_RT libxpurt.so "${KUNLUN_HOME}/so/")
-  find_library(KUNLUN_DNN libxpuapi.so "${KUNLUN_HOME}/so/")
+  find_library(KUNLUN_RT libxpurt.so "${KUNLUN_HOME}/lib64/")
+  find_library(KUNLUN_DNN libxpuapi.so "${KUNLUN_HOME}/lib64/")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -lstdc++ -Wall -Werror")
 
   if ((NOT DEFINED TARGET_CPU_ARCH) AND (NOT DEFINED ENV{TARGET_CPU_ARCH}))
diff --git a/cmake/FindXCCL.cmake b/cmake/FindXCCL.cmake
index fa4b3b00..28dd1f14 100644
--- a/cmake/FindXCCL.cmake
+++ b/cmake/FindXCCL.cmake
@@ -9,7 +9,7 @@ find_path(XCCL_INCLUDE_DIRS # ${XCCL_INCLUDE_DIR}
   HINTS XCCL_INCLUDE_DIR)
 
 find_library(XCCL_LIBRARIES # ${XCCL_LIB_DIR}
-  NAMES so/libbkcl.so
+  NAMES lib64/libbkcl.so
   HINTS XCCL_LIB_DIR)
 
 message(STATUS "XCCL_INCLUDE_DIRS: ${XCCL_INCLUDE_DIRS}")
diff --git a/include/core/kernel.h b/include/core/kernel.h
index 76189599..2e0d384a 100644
--- a/include/core/kernel.h
+++ b/include/core/kernel.h
@@ -5,8 +5,8 @@
 #include "utils/operator_utils.h"
 #include <functional>
 #include <nlohmann/json.hpp>
-using json = nlohmann::json;
 namespace infini {
+using json = nlohmann::json;
 
 class RuntimeObj; // Forward declaration for Kernel::compute
 
diff --git a/include/core/perf_engine.h b/include/core/perf_engine.h
index fb65da34..99a5916b 100644
--- a/include/core/perf_engine.h
+++ b/include/core/perf_engine.h
@@ -2,8 +2,8 @@
 #include "core/graph.h"
 #include "core/kernel.h"
 #include <nlohmann/json_fwd.hpp>
-using json = nlohmann::json;
 namespace infini {
+using json = nlohmann::json;
 
 class PerfEngine {
   public: