diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 86347af4..d45d465e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -32,6 +32,7 @@ env:
   B2_LINK: shared,static
   LCOV_BRANCH_COVERAGE: 0
   CODECOV_NAME: Github Actions
+  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
 
 jobs:
   posix:
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
index c59d0c88..54cdbce6 100644
--- a/.github/workflows/codecov.yml
+++ b/.github/workflows/codecov.yml
@@ -28,6 +28,7 @@ env:
   B2_LINK: shared,static
   LCOV_BRANCH_COVERAGE: 0
   CODECOV_NAME: Github Actions
+  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
 
 jobs:
   posix:
@@ -184,3 +185,15 @@ jobs:
       - name: Upload coverage
         if: matrix.coverage
         run: ci/codecov.sh "upload"
+        env:
+          BOOST_CI_CODECOV_IO_UPLOAD: skip
+
+      - name: Upload coverage
+        if: matrix.coverage
+        uses: codecov/codecov-action@v4
+        with:
+          disable_search: true
+          file: coverage.info
+          name: Github Actions
+          token: ${{secrets.CODECOV_TOKEN}}
+          verbose: true
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 301880e2..712c7ca7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,26 +12,60 @@ add_library(Boost::numeric_odeint ALIAS boost_numeric_odeint)
 
 target_include_directories(boost_numeric_odeint INTERFACE include)
 
-target_link_libraries(boost_numeric_odeint
-  INTERFACE
-    Boost::assert
-    Boost::compute
-    Boost::config
-    Boost::core
-    Boost::fusion
-    Boost::iterator
-    Boost::math
-    Boost::mpi
-    Boost::mpl
-    Boost::multi_array
-    Boost::numeric_ublas
-    Boost::preprocessor
-    Boost::range
-    Boost::throw_exception
-    Boost::type_traits
-    Boost::units
-    Boost::utility
-)
+if(BOOST_NUMERIC_ODEINT_NO_ADAPTORS)
+
+  target_link_libraries(boost_numeric_odeint
+    INTERFACE
+      Boost::assert
+      Boost::config
+      Boost::core
+      Boost::fusion
+      Boost::iterator
+      Boost::math
+      Boost::mpl
+      Boost::multi_array
+      Boost::numeric_ublas
+      Boost::preprocessor
+      Boost::range
+      Boost::static_assert
+      Boost::throw_exception
+      Boost::type_traits
+      Boost::units
+      Boost::utility
+  )
+
+else()
+
+  target_link_libraries(boost_numeric_odeint
+    INTERFACE
+      Boost::assert
+      Boost::compute
+      Boost::config
+      Boost::core
+      Boost::fusion
+      Boost::iterator
+      Boost::math
+      Boost::mpl
+      Boost::multi_array
+      Boost::numeric_ublas
+      Boost::preprocessor
+      Boost::range
+      Boost::static_assert
+      Boost::throw_exception
+      Boost::type_traits
+      Boost::units
+      Boost::utility
+  )
+
+  # From CMake 3.30 linking against MPI when it does not exist gives errors
+  if(BOOST_ENABLE_MPI)
+    target_link_libraries(boost_numeric_odeint
+      INTERFACE
+        Boost::mpi
+    )
+  endif()
+
+endif()
 
 if(BUILD_TESTING AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt")