diff --git a/CMakeLists.txt b/CMakeLists.txt
index 852a077d11..e790439096 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,6 +15,7 @@
 #
 #-------------------------------------------------
 cmake_minimum_required(VERSION 3.13)
+cmake_policy(SET CMP0144 NEW)
 project(
     MrDocs
     VERSION 0.8.0
@@ -550,11 +551,15 @@ if (MRDOCS_BUILD_TESTS)
     #-------------------------------------------------
     # XML lint
     #-------------------------------------------------
-    if (MRDOCS_BUILD_STRICT_TESTS)
-        # Strict mode expects xml-lint to run; require LibXml2.
-        find_package(LibXml2 REQUIRED)
-    else()
-        find_package(LibXml2)
+    # Try config mode first (e.g. libxml2 installed by bootstrap.py),
+    # then fall back to module mode (e.g. system libxml2-dev on Linux).
+    find_package(LibXml2 CONFIG)
+    if (NOT LibXml2_FOUND)
+        if (MRDOCS_BUILD_STRICT_TESTS)
+            find_package(LibXml2 REQUIRED)
+        else()
+            find_package(LibXml2)
+        endif()
     endif()
     if (LibXml2_FOUND)
         find_package(Java REQUIRED Runtime)
diff --git a/docs/package-lock.json b/docs/package-lock.json
index e8b7ac1c13..2a57122306 100644
--- a/docs/package-lock.json
+++ b/docs/package-lock.json
@@ -372,7 +372,6 @@
       "resolved": "https://registry.npmjs.org/@asciidoctor/core/-/core-2.2.8.tgz",
       "integrity": "sha512-oozXk7ZO1RAd/KLFLkKOhqTcG4GO3CV44WwOFg2gMcCsqCUTarvMT7xERIoWW2WurKbB0/ce+98r01p8xPOlBw==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "asciidoctor-opal-runtime": "0.3.3",
         "unxhr": "1.0.1"
@@ -2518,7 +2517,6 @@
       "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=0.4.0"
       }
diff --git a/util/bootstrap/src/recipes/loader.py b/util/bootstrap/src/recipes/loader.py
index ae2896ccd5..941618544d 100644
--- a/util/bootstrap/src/recipes/loader.py
+++ b/util/bootstrap/src/recipes/loader.py
@@ -47,7 +47,7 @@ def recipe_placeholders(
     Returns:
         Dictionary mapping placeholder names to values.
     """
-    host_suffix = "windows" if is_windows() else "unix"
+    host_suffix = "win" if is_windows() else "unix"
     return {
         "BOOTSTRAP_BUILD_TYPE": recipe.build_type,
         "BOOTSTRAP_BUILD_TYPE_LOWER": recipe.build_type.lower(),