diff --git a/.github/workflows/format.yaml b/.github/workflows/format.yaml
index 087d25e7..eeb8e9e9 100644
--- a/.github/workflows/format.yaml
+++ b/.github/workflows/format.yaml
@@ -11,7 +11,7 @@ permissions:
   contents: read
 
 jobs:
-  check-format-and-tidy:
+  check-format:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 42a50877..383d1770 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -5,12 +5,8 @@ on:
     paths:
       - '**.hpp'
       - '**.cpp'
-      - '**.clang-format'
       - '**.clang-tidy'
 
-permissions:
-  contents: read
-
 jobs:
   check-format-and-tidy:
     runs-on: ubuntu-latest
@@ -47,11 +43,12 @@ jobs:
         cmake_command: |
           cmake -Bbuild -S. -DCMAKE_EXPORT_COMPILE_COMMANDS=on -DGLFW_BUILD_WAYLAND=off
         clang_tidy_checks: '' # Use closest .clang-tidy config, not some weird default
-        split_workflow: true # So that comments work with fork PRs
+        split_workflow: ${{ github.event.pull_request.head.repo.fork }} # So that comments work with fork PRs
 
     # Upload review results as artifacts, a different workflow posts them
     # as comments. This is required due to security stuff.
     - uses: ZedThree/clang-tidy-review/upload@v0.21.0
+      id: upload-review
 
     # If there are any comments, fail the check
     - if: steps.review.outputs.total_comments > 0
diff --git a/samples/shadowmap/App.cpp b/samples/shadowmap/App.cpp
index 6a188531..fa48e992 100644
--- a/samples/shadowmap/App.cpp
+++ b/samples/shadowmap/App.cpp
@@ -31,10 +31,10 @@ App::App()
   auto instExts = windowing.getRequiredVulkanInstanceExtensions();
   renderer->initVulkan(instExts);
 
-  auto surface = mainWindow->createVkSurface(etna::get_context().getInstance());
+  auto surface_ = mainWindow->createVkSurface(etna::get_context().getInstance());
 
   renderer->initFrameDelivery(
-    std::move(surface), [window = mainWindow.get()]() { return window->getResolution(); });
+    std::move(surface_), [window = mainWindow.get()]() { return window->getResolution(); });
 
   // TODO: this is bad design, this initialization is dependent on the current ImGui context, but we
   // pass it implicitly here instead of explicitly. Beware if trying to do something tricky.