diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8bc294311f9..7317ebaee61 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -87,10 +87,12 @@ jobs:
           - compiler: clang++-7
             os: ubuntu-20.04
             packages: clang-7 lld-7
+            linker: lld-7
           - compiler: clang++-15
             os: ubuntu-22.04
             packages: clang-15 lld-15
             enable_file_prefix_map: true
+            linker: lld-15
         exclude:
           - compiler: clang++-7
             cppVersion: 20
@@ -117,9 +119,10 @@ jobs:
               -DCMAKE_BUILD_TYPE=Debug
               -DCMAKE_CXX_COMPILER=${{ matrix.compiler }}
               -DCMAKE_CXX_FLAGS="-Og ${{ matrix.enable_file_prefix_map && format('-ffile-prefix-map={0}/=/', runner.workspace) || ''}}
+                ${{ format('-fdebug-prefix-map={0}/=/', runner.workspace) || ''}}
                 -fno-omit-frame-pointer -fsanitize=address,undefined
                 -fsanitize-undefined-strip-path-components=$UBSAN_STRIP_COUNT"
-              -DCMAKE_EXE_LINKER_FLAGS="-fuse-ld=lld -fsanitize=address,undefined"
+              -DCMAKE_EXE_LINKER_FLAGS="-fuse-ld=${{ matrix.linker }} -fsanitize=address,undefined"
               -DCMAKE_CXX_STANDARD=${{ matrix.cppVersion }}
               -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
 
diff --git a/engine/lib/tcb/span.hpp b/engine/lib/tcb/span.hpp
index ab629e41dcb..5faf77ae4bf 100644
--- a/engine/lib/tcb/span.hpp
+++ b/engine/lib/tcb/span.hpp
@@ -609,15 +609,15 @@ constexpr auto get(span<E, S> s) -> decltype(s[N])
 namespace std {
 
 template <typename ElementType, size_t Extent>
-class tuple_size<TCB_SPAN_NAMESPACE_NAME::span<ElementType, Extent>>
+struct tuple_size<TCB_SPAN_NAMESPACE_NAME::span<ElementType, Extent>>
     : public integral_constant<size_t, Extent> {};
 
 template <typename ElementType>
-class tuple_size<TCB_SPAN_NAMESPACE_NAME::span<
+struct tuple_size<TCB_SPAN_NAMESPACE_NAME::span<
     ElementType, TCB_SPAN_NAMESPACE_NAME::dynamic_extent>>; // not defined
 
 template <size_t I, typename ElementType, size_t Extent>
-class tuple_element<I, TCB_SPAN_NAMESPACE_NAME::span<ElementType, Extent>> {
+struct tuple_element<I, TCB_SPAN_NAMESPACE_NAME::span<ElementType, Extent>> {
 public:
     static_assert(Extent != TCB_SPAN_NAMESPACE_NAME::dynamic_extent &&
                       I < Extent,