diff --git a/ports/cppmicroservices/CONTROL b/ports/cppmicroservices/CONTROL
index 9a53e06b16a304..4ca4793f00e70e 100644
--- a/ports/cppmicroservices/CONTROL
+++ b/ports/cppmicroservices/CONTROL
@@ -1,3 +1,5 @@
 Source: cppmicroservices
-Version: 4.0.0-pre1
+Version: v3.4.0
+Homepage: https://github.com/CppMicroServices/CppMicroServices
 Description: An OSGi-like C++ dynamic module system and service registry
+
diff --git a/ports/cppmicroservices/portfile.cmake b/ports/cppmicroservices/portfile.cmake
index d0edb63745a86b..c15e2eb8b13669 100644
--- a/ports/cppmicroservices/portfile.cmake
+++ b/ports/cppmicroservices/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO "CppMicroServices/CppMicroservices"
-    REF b322441568f903ef96c0ccb03e2611d052ceb4e0
-    SHA512 1673dfe9dba913890ec93e351263a924437a0d739a5858dcdc07650e1aaca30c3b4fcce59e32b201c1d65e15eb82e27912d759e4d07ecc149ae8a4f9eb1669bc
+    REF b4d3d404df01d67dfd7fc36111bc5de50e1b89d6 # v3.4.0
+    SHA512 b4a55f7c86cae25e936a237108b82824458b123fa1c14d4e0218c72c444a6d7f0db8900409af321225ec818f5691894b01fd311c606463386e7ce8e81e3656c8
     HEAD_REF development
     PATCHES werror.patch
 )
@@ -30,3 +30,4 @@ vcpkg_fixup_cmake_targets()
 if(NOT BUILD_SHARED_LIBS)
     set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
 endif()
+
diff --git a/ports/libguarded/CONTROL b/ports/libguarded/CONTROL
index c3786640614961..9d2c4c8303d14c 100644
--- a/ports/libguarded/CONTROL
+++ b/ports/libguarded/CONTROL
@@ -1,4 +1,4 @@
 Source: libguarded
-Version: 2019-08-27
+Version: 2019-08-27-1
 Homepage: https://github.com/copperspice/libguarded
 Description: The libGuarded library is a standalone header-only library for multithreaded programming.
\ No newline at end of file
diff --git a/ports/libguarded/portfile.cmake b/ports/libguarded/portfile.cmake
index d195774c366f9d..dd6b9368656b97 100644
--- a/ports/libguarded/portfile.cmake
+++ b/ports/libguarded/portfile.cmake
@@ -1,15 +1,11 @@
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO copperspice/libguarded
+    REPO copperspice/cs_libguarded
     REF 1f159aa866a50f5d2952de41d8a99821b8ec37df
-    SHA512 3ff138719b895a9c45492aee0a30e9f9eff2c3b3510de01dad59123fac6bdc1c7479518f5a81a61e4d25c0f9679b21b5018953d99809f52aafa7729599a3282a
+    SHA512 91380262e65ec7b8990c500c60b8d141960be24b69e01a4661c2e8fbfdb8e315c9a4509c2c65a74bc60a8fe690d6dbc8f2b39757d13da5068c95283a19d4c6c4
     HEAD_REF master
 )
 
 File(COPY ${SOURCE_PATH}/src/libguarded DESTINATION ${CURRENT_PACKAGES_DIR}/include)
 
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
-
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index e7a20960117501..ce3d7d38415129 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -273,6 +273,7 @@ cppkafka:x64-linux=ignore
 cppmicroservices:arm64-windows=fail
 cppmicroservices:arm-uwp=fail
 cppmicroservices:x64-uwp=fail
+cppmicroservices:x64-osx=fail
 cpp-netlib:arm-uwp=fail
 cpp-netlib:x64-uwp=fail
 cpp-netlib:x64-linux=ignore
@@ -442,7 +443,6 @@ fluidsynth:x64-osx=fail
 fmem:arm-uwp=fail
 fmem:x64-uwp=fail
 fmi4cpp:arm-uwp=fail
-fmi4cpp:x64-osx=fail
 fmi4cpp:x64-uwp=fail
 fmilib:arm64-windows=fail
 fmilib:arm-uwp=fail
@@ -472,7 +472,6 @@ freetds:arm-uwp=fail
 freetds:x64-linux=fail
 freetds:x64-osx=fail
 freetds:x64-uwp=fail
-freetype-gl:x64-osx=fail
 freetype-gl:x64-uwp=fail
 freexl:arm-uwp=fail
 freexl:arm64-windows=ignore
@@ -485,7 +484,6 @@ fribidi:arm-uwp=fail
 fribidi:x64-linux=fail
 fribidi:x64-osx=fail
 fribidi:x64-uwp=fail
-fruit:x64-osx=fail
 ftgl:x64-linux=fail
 ftgl:x64-osx=fail
 ftgl:x64-uwp=fail
@@ -536,6 +534,7 @@ glfw3:arm-uwp=fail
 glfw3:x64-uwp=fail
 glib:x64-uwp=fail
 glib:x64-windows-static=fail
+glib:x64-osx=fail
 globjects:x64-linux=ignore
 gmmlib:arm64-windows=fail
 gmmlib:arm-uwp=fail
@@ -576,7 +575,6 @@ hidapi:arm-uwp=fail
 hidapi:x64-linux=fail
 hidapi:x64-osx=fail
 hidapi:x64-uwp=fail
-highfive:x64-osx=fail
 hiredis:arm-uwp=fail
 hiredis:x64-uwp=fail
 hpx:x64-windows-static=fail
@@ -616,7 +614,6 @@ intel-mkl:x64-windows-static=fail
 intel-mkl:x86-windows=fail
 intelrdfpmathlib:arm-uwp=fail
 intelrdfpmathlib:x64-linux=fail
-intelrdfpmathlib:x64-osx=fail
 intelrdfpmathlib:x64-uwp=fail
 io2d:x64-linux=fail
 irrlicht:arm64-windows=fail
@@ -682,6 +679,7 @@ libb2:x64-windows-static=fail
 libb2:x64-uwp=fail
 libb2:arm64-windows=fail
 libb2:arm-uwp=fail
+libb2:x64-osx=fail
 libbf:arm64-windows=fail
 libbf:arm-uwp=fail
 libbf:x64-uwp=fail
@@ -763,6 +761,7 @@ libmagic:x64-windows-static=fail
 libmagic:x64-uwp=fail
 libmagic:arm64-windows=fail
 libmagic:arm-uwp=fail
+libmagic:x64-osx=fail
 libmariadb:arm64-windows      = skip
 libmariadb:arm-uwp            = skip
 libmariadb:x64-linux          = skip
@@ -835,7 +834,9 @@ libpff:x64-linux=fail
 libpff:x64-osx=fail
 libpff:x64-uwp=fail
 libpff:x64-windows-static=fail
-libplist:x64-osx=fail
+libplist:arm64-windows=fail
+libplist:arm-uwp=fail
+libplist:x64-linux=fail
 libplist:x64-windows-static=fail
 libpng-apng:arm64-windows      = skip
 libpng-apng:arm-uwp            = skip
@@ -938,7 +939,6 @@ libxslt:arm-uwp=fail
 libxslt:x64-osx=fail
 libxslt:x64-uwp=fail
 libyuv:arm-uwp=fail
-libyuv:x64-osx=fail
 libyuv:x64-uwp=fail
 libzen:arm-uwp=fail
 libzen:x64-uwp=fail
@@ -1180,6 +1180,7 @@ ompl:x64-osx=fail
 ompl:x64-linux=ignore
 open62541:arm-uwp=fail
 open62541:x64-uwp=fail
+open62541:x64-osx=fail
 openal-soft:arm-uwp=fail
 openal-soft:x64-uwp=fail
 openblas:arm64-windows=fail
@@ -1288,7 +1289,6 @@ pangomm:x64-windows=ignore
 pangomm:x86-windows=ignore
 parmetis:x64-linux=fail
 parmetis:x64-osx=fail
-pbc:x64-osx=fail
 pcre2:arm-uwp=fail
 pdal:x64-linux=fail
 pdal:x64-osx=fail
@@ -1626,6 +1626,7 @@ tfhe:x64-windows-static=fail
 tfhe:x64-uwp=fail
 tfhe:arm64-windows=fail
 tfhe:arm-uwp=fail
+tfhe:x64-osx=fail
 theia:arm64-windows      = skip
 theia:arm-uwp            = skip
 theia:x64-uwp            = skip
@@ -1806,7 +1807,6 @@ yasm:x64-uwp=fail
 yato:arm64-windows=fail
 yato:arm-uwp=fail
 yato:x64-uwp=fail
-yoga:x64-osx=fail
 z3:arm64-windows=fail
 z3:arm-uwp=fail
 z3:x64-uwp=fail
@@ -1824,4 +1824,4 @@ zeromq:x64-uwp=fail
 akali:x64-uwp=fail
 akali:arm-uwp=fail
 akali:arm64-windows=fail
-
+akali:x64-osx=fail