diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index be9865f8b..f4cf2868b 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -101,7 +101,7 @@ jobs:
         continue-on-error: true
         working-directory: build/${{ env.preset }}/out
         env:
-          PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-osx/share/proj/data
+          PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-osx/share/proj
         run: ./mapnik-test-visual -j $(sysctl -n hw.logicalcpu) --output-dir ./visual-test-result
 
       - name: Pack visual test results
@@ -111,7 +111,7 @@ jobs:
       - name: Run Benchmark
         working-directory: build/${{ env.preset }}/out
         env:
-          PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-osx/share/proj/data
+          PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-osx/share/proj
         run: ./run_benchmarks
 
       - name: Coverage
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 8305e084b..34b972068 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -28,7 +28,7 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
 
     services:
       postgres:
@@ -117,7 +117,7 @@ jobs:
         continue-on-error: true
         working-directory: build/${{ env.preset }}/out
         env:
-          PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-linux/share/proj/data
+          PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-linux/share/proj
         run: ./mapnik-test-visual -j $(nproc) --output-dir ./visual-test-result
 
       - name: Pack visual test results
@@ -127,7 +127,7 @@ jobs:
       - name: Run Benchmarks
         working-directory: build/${{ env.preset }}/out
         env:
-          PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-linux/share/proj/data
+          PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-linux/share/proj
         run: ./run_benchmarks
 
       - name: Coverage
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 2ad229ddf..0abc5b2ff 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -104,7 +104,7 @@ jobs:
         continue-on-error: true
         working-directory: build/${{ env.preset }}/out
         env:
-          PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-windows/share/proj/data
+          PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-windows/share/proj
         run: OpenCppCoverage --modules *libmapnik* --modules mapnik*.exe  --modules *.input --sources ${{ github.workspace }} --export_type binary --input_coverage=${{ github.workspace }}/ctest.cov --cover_children -- .\mapnik-test-visual.exe -j (Get-CimInstance -ClassName Win32_ComputerSystem).NumberOfLogicalProcessors --output-dir ./visual-test-result
 
       - name: Pack visual test results
diff --git a/.gitignore b/.gitignore
index 9f55b20da..4c6b0418f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 .DS_Store
 .vscode
+.cache
 *.gcov
 *.gcda
 *.gcno
diff --git a/CMakePresets.json b/CMakePresets.json
index 61a84d330..08efaa020 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -195,7 +195,7 @@
                 "ADDITIONAL_LIBARIES_PATHS": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-windows/bin"
             },
             "environment": {
-                "PROJ_LIB": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-windows/share/proj/data"
+                "PROJ_LIB": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-windows/share/proj"
             }
         },
         {
@@ -210,7 +210,7 @@
                 "CMAKE_CXX_FLAGS": "--coverage"
             },
             "environment": {
-                "PROJ_LIB": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-linux/share/proj/data"
+                "PROJ_LIB": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-linux/share/proj"
             }
         },
         {
@@ -226,7 +226,7 @@
                 "CMAKE_CXX_FLAGS": "-fprofile-arcs -ftest-coverage"
             },
             "environment": {
-                "PROJ_LIB": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-osx/share/proj/data"
+                "PROJ_LIB": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-osx/share/proj"
             }
         }
     ],
diff --git a/test/unit/vertex_adapter/simplify_converters_test.cpp b/test/unit/vertex_adapter/simplify_converters_test.cpp
index 49765eca1..b13e3aa69 100644
--- a/test/unit/vertex_adapter/simplify_converters_test.cpp
+++ b/test/unit/vertex_adapter/simplify_converters_test.cpp
@@ -37,7 +37,7 @@ void simplify(std::string const& wkt_in, double tolerance, std::string const& me
             output.emplace_back(x, y);
         }
         std::string wkt_out;
-        REQUIRE(mapnik::util::to_wkt(wkt_out, output));
+        REQUIRE(mapnik::util::to_wkt(wkt_out, mapnik::geometry::geometry<double>{output}));
         REQUIRE(wkt_out == expected);
     }
 }
diff --git a/vcpkg.json b/vcpkg.json
index 1bc58e8c3..0bab0f24c 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -52,7 +52,6 @@
     },
     "icu",
     "libjpeg-turbo",
-    "libodb-pgsql",
     "libpng",
     "libpq",
     "libwebp",