diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index 31489378a3..12a4c04348 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -177,9 +177,7 @@ jobs:
           ./bootstrap
           mkdir build
           cd build
-          # Some commits hang the linking step during one of the following targets
-          # Passing -DUSE_LLD=OFF will use the default mingw ld linker which doesn't have this issue
-          cmake -G Ninja -DUSE_LLD=OFF -DCMAKE_BUILD_TYPE=${{ steps.setup.outputs.build-type }} -DUSE_LIBBACKTRACE=${{ steps.setup.outputs.bitness == '64bits' }} ..
+          cmake -G Ninja -DCMAKE_BUILD_TYPE=${{ steps.setup.outputs.build-type }} -DUSE_LIBBACKTRACE=${{ steps.setup.outputs.bitness == '64bits' }} ..
           ninja ${{ steps.setup.outputs.build-target }}
       - name: Test runtime (Debug)
         if: ${{ steps.setup.outputs.runtime-tests == 'true' && steps.setup.outputs.build-type == 'Debug' }}
diff --git a/src/gfx/drawable_processors/mesh_drawable_processor.hpp b/src/gfx/drawable_processors/mesh_drawable_processor.hpp
index a1ccc48439..4f6acc7a96 100644
--- a/src/gfx/drawable_processors/mesh_drawable_processor.hpp
+++ b/src/gfx/drawable_processors/mesh_drawable_processor.hpp
@@ -283,7 +283,7 @@ struct MeshDrawableProcessor final : public IDrawableProcessor {
   void waitForBufferMap(Context &context, PrepareData *prepareData) {
     do {
       bool everythingMapped = true;
-      auto check = [&](auto buffers) {
+      auto check = [&](auto& buffers) {
         for (auto &drawBuffer : buffers) {
           if (drawBuffer.mappingStatus == WGPUBufferMapAsyncStatus_Unknown)
             everythingMapped = false;