diff --git a/ports/dmlc/CONTROL b/ports/dmlc/CONTROL
index 9a0c2c370703e0..c75a86da6fff51 100644
--- a/ports/dmlc/CONTROL
+++ b/ports/dmlc/CONTROL
@@ -1,5 +1,5 @@
 Source: dmlc
-Version: 2019-08-12-2
+Version: 2019-08-12-3
 Homepage: https://github.com/dmlc/dmlc-core
 Description: DMLC-Core is the backbone library to support all DMLC projects, offers the bricks to build efficient and scalable distributed machine learning libraries.
 Default-Features: openmp
diff --git a/ports/libpq/CONTROL b/ports/libpq/CONTROL
index 979cd7901019e2..8b2c9f24994b21 100644
--- a/ports/libpq/CONTROL
+++ b/ports/libpq/CONTROL
@@ -1,5 +1,5 @@
 Source: libpq
-Version: 12.2
+Version: 12.2-1
 Build-Depends: libpq[bonjour] (osx)
 Supports: !uwp
 Homepage: https://www.postgresql.org/
diff --git a/ports/libpq/vcpkg-cmake-wrapper.cmake b/ports/libpq/vcpkg-cmake-wrapper.cmake
index 29a81eeddb7419..5fd40d26ca8065 100644
--- a/ports/libpq/vcpkg-cmake-wrapper.cmake
+++ b/ports/libpq/vcpkg-cmake-wrapper.cmake
@@ -10,6 +10,8 @@ if(PostgreSQL_FOUND)
     find_library(PostgreSQL_DL_LIBRARY NAMES dl)
     if(PostgreSQL_DL_LIBRARY)
         list(APPEND PostgreSQL_LIBRARIES "dl")
-        set_property(TARGET PostgreSQL::PostgreSQL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "dl")
+        if(TARGET PostgreSQL::PostgreSQL)
+            set_property(TARGET PostgreSQL::PostgreSQL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "dl")
+        endif()
     endif()
 endif()
diff --git a/ports/opencc/CONTROL b/ports/opencc/CONTROL
index 7b6ee7df4e2eab..b59adc760068e6 100644
--- a/ports/opencc/CONTROL
+++ b/ports/opencc/CONTROL
@@ -1,5 +1,5 @@
 Source: opencc
-Version: 2020-04-26-3
+Version: 2020-04-26-4
 Description: A project for conversion between Traditional and Simplified Chinese
 Homepage: https://github.com/BYVoid/OpenCC
 Supports: !(arm|arm64|uwp)
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index c2f43e40b86455..9738e197a6a98b 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -225,8 +225,14 @@ chakracore:x64-osx=fail
 chakracore:x64-uwp=fail
 chakracore:x64-windows-static=fail
 # DCMTK currently has a vendored copy of libcharls.a, which causes conflicts with charls (TODO: use charls' copy)
+charls:arm64-windows=skip
+charls:arm-uwp=skip
 charls:x64-linux=skip
 charls:x64-osx=skip
+charls:x64-uwp=skip
+charls:x64-windows=skip
+charls:x64-windows-static=skip
+charls:x86-windows=skip
 chartdir:arm64-windows=fail
 chartdir:arm-uwp=fail
 chartdir:x64-uwp=fail