diff --git a/cmake/modules/ImHexPlugin.cmake b/cmake/modules/ImHexPlugin.cmake
index 9e9582e32..fbe589815 100644
--- a/cmake/modules/ImHexPlugin.cmake
+++ b/cmake/modules/ImHexPlugin.cmake
@@ -65,10 +65,19 @@ macro(add_imhex_plugin)
         add_definitions(-DIMHEX_PLUGIN_${IMHEX_PLUGIN_NAME}_FEATURE_${feature}=0)
     endforeach()
 
+    # Fix rpath
+    if (APPLE)
+        set_target_properties(${IMHEX_PLUGIN_NAME} PROPERTIES INSTALL_RPATH "@executable_path/../Frameworks")
+    endif()
+
     # Add the new plugin to the main dependency list so it gets built by default
     if (TARGET imhex_all)
         add_dependencies(imhex_all ${IMHEX_PLUGIN_NAME})
     endif()
+    
+    if (IMHEX_EXTERNAL_PLUGIN_BUILD)
+        install(TARGETS ${IMHEX_PLUGIN_NAME} DESTINATION ".")
+    endif()
 endmacro()
 
 macro(add_romfs_resource input output)
diff --git a/cmake/sdk/CMakeLists.txt b/cmake/sdk/CMakeLists.txt
index 2645ca1e3..e41deee42 100644
--- a/cmake/sdk/CMakeLists.txt
+++ b/cmake/sdk/CMakeLists.txt
@@ -13,18 +13,20 @@ function(add_subdirectory_if_exists folder)
     endif()
 endfunction()
 
-set(IMHEX_EXTERNAL_PLUGIN_BUILD ON)
+set(IMHEX_EXTERNAL_PLUGIN_BUILD ON PARENT_SCOPE)
 add_custom_target(imhex_all)
 
 add_subdirectory(lib/third_party/imgui)
-add_subdirectory_if_exists(lib/third_party/fmt)
-add_subdirectory_if_exists(lib/third_party/nlohmann_json)
 
+set(FMT_INSTALL OFF CACHE BOOL "" FORCE)
+add_subdirectory_if_exists(lib/third_party/fmt)
 set(FMT_LIBRARIES fmt::fmt-header-only PARENT_SCOPE)
 
+add_subdirectory_if_exists(lib/third_party/nlohmann_json)
+
 add_subdirectory(lib/external/libwolv)
 
-set(LIBPL_BUILD_CLI_AS_EXECUTABLE OFF)
+set(LIBPL_ENABLE_CLI OFF)
 add_subdirectory(lib/external/pattern_language)
 
 add_subdirectory(lib/libimhex)
diff --git a/lib/external/pattern_language b/lib/external/pattern_language
index 312dc93be..78cdc3e7f 160000
--- a/lib/external/pattern_language
+++ b/lib/external/pattern_language
@@ -1 +1 @@
-Subproject commit 312dc93becd44f24105baad2574b8449f449e831
+Subproject commit 78cdc3e7fd67ec7c95a186ee97215ff29a0316ce