diff --git a/ports/mxml/portfile.cmake b/ports/mxml/portfile.cmake
index 3f3cd1c1ba..814dfb5a05 100644
--- a/ports/mxml/portfile.cmake
+++ b/ports/mxml/portfile.cmake
@@ -8,6 +8,20 @@ vcpkg_from_github(
 )
 
 if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+    # Force Z7 debug information format for MSVC builds
+    vcpkg_replace_string("${SOURCE_PATH}/vcnet/mxml4.vcxproj"
+      "<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>"
+      "<DebugInformationFormat>OldStyle</DebugInformationFormat>"
+    )
+    vcpkg_replace_string("${SOURCE_PATH}/vcnet/mxml4.vcxproj"
+      "<DebugInformationFormat>EditAndContinue</DebugInformationFormat>"
+      "<DebugInformationFormat>OldStyle</DebugInformationFormat>"
+    )
+    vcpkg_replace_string("${SOURCE_PATH}/vcnet/mxml4.vcxproj"
+        "<MinimalRebuild>true</MinimalRebuild>"
+        "<MinimalRebuild>false</MinimalRebuild>"
+    )
+
     vcpkg_msbuild_install(
         SOURCE_PATH "${SOURCE_PATH}"
         PROJECT_SUBPATH "vcnet/mxml4.vcxproj"
diff --git a/ports/mxml/vcpkg.json b/ports/mxml/vcpkg.json
index 4301a96741..2b48247dba 100644
--- a/ports/mxml/vcpkg.json
+++ b/ports/mxml/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "mxml",
   "version": "4.0.4",
+  "port-version": 1,
   "description": "A tiny xml parsing library",
   "homepage": "https://github.com/michaelrsweet/mxml",
   "license": "Apache-2.0",
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index b34ab844f9..33296501ee 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -788,7 +788,6 @@ outcome:arm64-android=fail
 outcome:x64-android=fail
 paho-mqtt:arm64-uwp=fail
 paho-mqtt:x64-uwp=fail
-pcl:x64-android=fail
 platform-folders:arm64-uwp=fail
 platform-folders:x64-uwp=fail
 plib:arm-neon-android=fail
@@ -831,12 +830,8 @@ qt5-webengine:x86-windows=skip
 # Missing system libraries
 qt5-x11extras:arm64-osx=skip
 qt5-x11extras:x64-osx=skip
-qtmultimedia:arm-neon-android=fail
 qtmultimedia:arm64-android=fail
 qtmultimedia:x64-android=fail
-qtquick3d:arm-neon-android=fail
-qtquick3d:arm64-android=fail
-qtquick3d:x64-android=fail
 qtwayland:arm-neon-android=fail
 qtwayland:arm64-android=fail
 qtwayland:x64-android=fail
@@ -1043,9 +1038,6 @@ v8:x64-windows-static-md=fail
 v8:x64-windows-static=fail
 v8:x64-windows=fail
 v8:x86-windows=fail
-vowpal-wabbit:arm-neon-android=fail
-vowpal-wabbit:arm64-android=fail
-vowpal-wabbit:x64-android=fail
 # vst3sdk CMake files work only with the GUI version of Xcode
 vst3sdk:arm64-osx=fail
 vst3sdk:x64-osx=fail
diff --git a/versions/baseline.json b/versions/baseline.json
index 787b6b6fed..f2d9afcb79 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6502,7 +6502,7 @@
     },
     "mxml": {
       "baseline": "4.0.4",
-      "port-version": 0
+      "port-version": 1
     },
     "mygui": {
       "baseline": "3.4.3",
diff --git a/versions/m-/mxml.json b/versions/m-/mxml.json
index 4f92d15955..d423588341 100644
--- a/versions/m-/mxml.json
+++ b/versions/m-/mxml.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5967622b8c8f75c416aeb5fb4754e64f6a330a5f",
+      "version": "4.0.4",
+      "port-version": 1
+    },
     {
       "git-tree": "b6639c615e5d07b5b2af1d71248c6fc41321d90b",
       "version": "4.0.4",