diff --git a/ports/cartographer/CONTROL b/ports/cartographer/CONTROL
index 88f0dc6b7..73fcc6541 100644
--- a/ports/cartographer/CONTROL
+++ b/ports/cartographer/CONTROL
@@ -1,4 +1,4 @@
 Source: cartographer
-Version: 0.3.0-4
+Version: 0.3.0-5
 Build-Depends: ceres[eigensparse], gflags, glog, lua, cairo, boost-iostreams, gtest, protobuf
 Description: Google 2D & 3D SLAM package
diff --git a/ports/cartographer/disable-C2338-cartographer.patch b/ports/cartographer/disable-C2338-cartographer.patch
new file mode 100644
index 000000000..d43367218
--- /dev/null
+++ b/ports/cartographer/disable-C2338-cartographer.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bc92e9b..4c1826a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -226,7 +226,7 @@ target_include_directories(${PROJECT_NAME} SYSTEM PRIVATE
+   "${GMOCK_INCLUDE_DIRS}")
+ target_link_libraries(${PROJECT_NAME} PUBLIC ${GMOCK_LIBRARY})
+ 
+-set(TARGET_COMPILE_FLAGS "${TARGET_COMPILE_FLAGS} ${GOOG_CXX_FLAGS}")
++set(TARGET_COMPILE_FLAGS "-D_DISABLE_EXTENDED_ALIGNED_STORAGE ${TARGET_COMPILE_FLAGS} ${GOOG_CXX_FLAGS}")
+ set_target_properties(${PROJECT_NAME} PROPERTIES
+   COMPILE_FLAGS ${TARGET_COMPILE_FLAGS})
+ 
diff --git a/ports/cartographer/portfile.cmake b/ports/cartographer/portfile.cmake
index 75f28a015..45a3c1b99 100644
--- a/ports/cartographer/portfile.cmake
+++ b/ports/cartographer/portfile.cmake
@@ -6,12 +6,9 @@ vcpkg_from_github(
     REF a7ed7e224f98b396762c865b81b62dc3abea2e81
     SHA512 2ab167c1c314591b4916baf70b8ad92ae542986c3578319d2454c904adae10f8027bc696579d6e2864d3606a6711563b82438e847527cad4ab0c2bd603a63eb7
     HEAD_REF master
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES
+	PATCHES
         ${CMAKE_CURRENT_LIST_DIR}/fix-find-packages.patch
+        ${CMAKE_CURRENT_LIST_DIR}/disable-C2338-cartographer.patch
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/mongo-cxx-driver/CONTROL b/ports/mongo-cxx-driver/CONTROL
index 065fbbab0..08de8ddec 100644
--- a/ports/mongo-cxx-driver/CONTROL
+++ b/ports/mongo-cxx-driver/CONTROL
@@ -1,4 +1,4 @@
 Source: mongo-cxx-driver
-Version: 3.1.1-2
+Version: 3.1.1-3
 Build-Depends: libbson, mongo-c-driver, boost-smart-ptr, boost-optional, boost-utility
 Description: MongoDB C++ Driver.
diff --git a/ports/mongo-cxx-driver/disable-c2338-mongo-cxx-driver.patch b/ports/mongo-cxx-driver/disable-c2338-mongo-cxx-driver.patch
new file mode 100644
index 000000000..04bbcd638
--- /dev/null
+++ b/ports/mongo-cxx-driver/disable-c2338-mongo-cxx-driver.patch
@@ -0,0 +1,11 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index a019eb1..8ab0f71 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -14,5 +14,6 @@
+ 
+ add_definitions(-DMONGO_CXX_DRIVER_COMPILING)
+ add_definitions(-D_SCL_SECURE_NO_WARNINGS)
++add_definitions(-D_DISABLE_EXTENDED_ALIGNED_STORAGE)
+ add_subdirectory(bsoncxx)
+ add_subdirectory(mongocxx)
diff --git a/ports/mongo-cxx-driver/portfile.cmake b/ports/mongo-cxx-driver/portfile.cmake
index fd978a271..b80c8a5bf 100644
--- a/ports/mongo-cxx-driver/portfile.cmake
+++ b/ports/mongo-cxx-driver/portfile.cmake
@@ -1,19 +1,15 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mongo-cxx-driver-r3.1.1)
-
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/mongodb/mongo-cxx-driver/archive/r3.1.1.tar.gz"
-    FILENAME "mongo-cxx-driver-r3.1.1.tar.gz"
+vcpkg_from_github(
+	OUT_SOURCE_PATH SOURCE_PATH
+    REPO mongodb/mongo-cxx-driver
+	REF r3.1.1
     SHA512 ba8a735e5645cbce4497df71a4577e891d507f577dbd5270ec8a82e54c39c2806bf2ff4848b621f18b36d31fb6031e5b4211972b661c43009bff0ed7ab6cf338
-)
-vcpkg_extract_source_archive(${ARCHIVE})
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/disable_test_and_example.patch
-        ${CMAKE_CURRENT_LIST_DIR}/disable_shared.patch
-        ${CMAKE_CURRENT_LIST_DIR}/fix-uwp.patch
+	HEAD_REF master
+	PATCHES
+	 "${CURRENT_PORT_DIR}/disable_test_and_example.patch"
+	 "${CURRENT_PORT_DIR}/disable_shared.patch"
+	 "${CURRENT_PORT_DIR}/fix-uwp.patch"
+	 "${CURRENT_PORT_DIR}/disable-c2338-mongo-cxx-driver.patch"
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/mongo-cxx-driver/static.patch b/ports/mongo-cxx-driver/static.patch
deleted file mode 100644
index a485efe3d..000000000
--- a/ports/mongo-cxx-driver/static.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/mongocxx/config/export.hpp b/mongocxx/config/export.hpp
-index 61a3e74..7fc951c 100644
---- a/mongocxx/config/export.hpp
-+++ b/mongocxx/config/export.hpp
-@@ -2,6 +2,7 @@
- #ifndef MONGOCXX_API_H
- #define MONGOCXX_API_H
- 
-+#define MONGOCXX_STATIC
- #ifdef MONGOCXX_STATIC
- #  define MONGOCXX_API
- #  define MONGOCXX_PRIVATE