diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26840fef..e961e446 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,7 +36,7 @@
 - Def: Fixed compilation error in tests with Clang 21. (#6519)
 - Dev: Fixed compilation warnings on clang-cl. (#6528)
 - Dev: Fixed compilation error in tests with Clang 21. (#6519)
-- Dev: Use CMake's `FetchContent` for RapidJSON, PajladaSignals, PajladaSerialize, and PajladaSettings. (#6560, #6567)
+- Dev: Use CMake's `FetchContent` for RapidJSON, PajladaSignals, PajladaSerialize, and PajladaSettings. (#6560, #6567, #6569)
 - Dev: The LuaLS meta files moved from `docs/plugin-meta.lua` to `docs/lua-meta/globals.lua`. (#6530)
 - Dev: Compile time definitions for `Windows.h` are now conditional based on `WIN32` instead of `MSVC`. (#6534)
 - Dev: Refactored split container nodes to use shared pointers. (#6435)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d9983e0..869c994a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,5 @@
 cmake_minimum_required(VERSION 3.15)
+set(CMAKE_EXPORT_NO_PACKAGE_REGISTRY On) # For rapidjson
 cmake_policy(SET CMP0087 NEW) # evaluates generator expressions in `install(CODE/SCRIPT)`
 cmake_policy(SET CMP0091 NEW) # select MSVC runtime library through `CMAKE_MSVC_RUNTIME_LIBRARY`
 include(FeatureSummary)
@@ -224,10 +225,10 @@ if (BUILD_BENCHMARKS)
 endif ()
 
 FetchContent_Declare(
-    rjlib
+    RapidJSON
     SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/lib/rapidjson
     EXCLUDE_FROM_ALL
-    FIND_PACKAGE_ARGS NAMES RapidJSON
+    FIND_PACKAGE_ARGS
 )
 set(RAPIDJSON_BUILD_EXAMPLES Off CACHE INTERNAL "")
 set(RAPIDJSON_BUILD_TESTS Off CACHE INTERNAL "")
@@ -248,7 +249,7 @@ FetchContent_Declare(
     EXCLUDE_FROM_ALL
 )
 
-FetchContent_MakeAvailable(rjlib PajladaSignals PajladaSerialize PajladaSettings)
+FetchContent_MakeAvailable(RapidJSON PajladaSignals PajladaSerialize PajladaSettings)
 
 find_package(LRUCache REQUIRED)
 find_package(MagicEnum REQUIRED)
diff --git a/lib/serialize b/lib/serialize
index a186548a..f4a7dbfa 160000
--- a/lib/serialize
+++ b/lib/serialize
@@ -1 +1 @@
-Subproject commit a186548aae372b9b4e69fc08de09886f3aa4240b
+Subproject commit f4a7dbfa64e7515506bdb75f6037cb74cd37f67c
diff --git a/lib/settings b/lib/settings
index ae393eaa..d847148c 160000
--- a/lib/settings
+++ b/lib/settings
@@ -1 +1 @@
-Subproject commit ae393eaa81154f1e35872aff333a619a451f7eae
+Subproject commit d847148cbf0becb75e48b90c2c25b78922f4e181