Merge branch 'main' into zcache-batch

123 files changed, 44 insertions, 34 deletions

diff --git a/3rdparty/BLAKE3/.github/workflows/build_b3sum.py b/thirdparty/BLAKE3/.github/workflows/build_b3sum.py
index e487daf97..e487daf97 100644
--- a/3rdparty/BLAKE3/.github/workflows/build_b3sum.py
+++ b/thirdparty/BLAKE3/.github/workflows/build_b3sum.py
diff --git a/3rdparty/BLAKE3/.github/workflows/ci.yml b/thirdparty/BLAKE3/.github/workflows/ci.yml
index 464a411d5..464a411d5 100644
--- a/3rdparty/BLAKE3/.github/workflows/ci.yml
+++ b/thirdparty/BLAKE3/.github/workflows/ci.yml
diff --git a/3rdparty/BLAKE3/.github/workflows/tag.yml b/thirdparty/BLAKE3/.github/workflows/tag.yml
index 577d4f312..577d4f312 100644
--- a/3rdparty/BLAKE3/.github/workflows/tag.yml
+++ b/thirdparty/BLAKE3/.github/workflows/tag.yml
diff --git a/3rdparty/BLAKE3/.github/workflows/upload_github_release_asset.py b/thirdparty/BLAKE3/.github/workflows/upload_github_release_asset.py
index c1cbf518b..c1cbf518b 100644
--- a/3rdparty/BLAKE3/.github/workflows/upload_github_release_asset.py
+++ b/thirdparty/BLAKE3/.github/workflows/upload_github_release_asset.py
diff --git a/3rdparty/BLAKE3/.gitignore b/thirdparty/BLAKE3/.gitignore
index fa8d85ac5..fa8d85ac5 100644
--- a/3rdparty/BLAKE3/.gitignore
+++ b/thirdparty/BLAKE3/.gitignore
diff --git a/3rdparty/BLAKE3/CONTRIBUTING.md b/thirdparty/BLAKE3/CONTRIBUTING.md
index 3a605f255..3a605f255 100644
--- a/3rdparty/BLAKE3/CONTRIBUTING.md
+++ b/thirdparty/BLAKE3/CONTRIBUTING.md
diff --git a/3rdparty/BLAKE3/Cargo.toml b/thirdparty/BLAKE3/Cargo.toml
index 3df0fd279..3df0fd279 100644
--- a/3rdparty/BLAKE3/Cargo.toml
+++ b/thirdparty/BLAKE3/Cargo.toml
diff --git a/3rdparty/BLAKE3/LICENSE b/thirdparty/BLAKE3/LICENSE
index f5892efc3..f5892efc3 100644
--- a/3rdparty/BLAKE3/LICENSE
+++ b/thirdparty/BLAKE3/LICENSE
diff --git a/3rdparty/BLAKE3/README.md b/thirdparty/BLAKE3/README.md
index 360183668..360183668 100644
--- a/3rdparty/BLAKE3/README.md
+++ b/thirdparty/BLAKE3/README.md
diff --git a/3rdparty/BLAKE3/b3sum/Cargo.toml b/thirdparty/BLAKE3/b3sum/Cargo.toml
index 4678bee2d..4678bee2d 100644
--- a/3rdparty/BLAKE3/b3sum/Cargo.toml
+++ b/thirdparty/BLAKE3/b3sum/Cargo.toml
diff --git a/3rdparty/BLAKE3/b3sum/README.md b/thirdparty/BLAKE3/b3sum/README.md
index e97830b7c..e97830b7c 100644
--- a/3rdparty/BLAKE3/b3sum/README.md
+++ b/thirdparty/BLAKE3/b3sum/README.md
diff --git a/3rdparty/BLAKE3/b3sum/src/main.rs b/thirdparty/BLAKE3/b3sum/src/main.rs
index b01e5de58..b01e5de58 100644
--- a/3rdparty/BLAKE3/b3sum/src/main.rs
+++ b/thirdparty/BLAKE3/b3sum/src/main.rs
diff --git a/3rdparty/BLAKE3/b3sum/src/unit_tests.rs b/thirdparty/BLAKE3/b3sum/src/unit_tests.rs
index 1fa1a17dc..1fa1a17dc 100644
--- a/3rdparty/BLAKE3/b3sum/src/unit_tests.rs
+++ b/thirdparty/BLAKE3/b3sum/src/unit_tests.rs
diff --git a/3rdparty/BLAKE3/b3sum/tests/cli_tests.rs b/thirdparty/BLAKE3/b3sum/tests/cli_tests.rs
index 51fbbba98..51fbbba98 100644
--- a/3rdparty/BLAKE3/b3sum/tests/cli_tests.rs
+++ b/thirdparty/BLAKE3/b3sum/tests/cli_tests.rs
diff --git a/3rdparty/BLAKE3/b3sum/what_does_check_do.md b/thirdparty/BLAKE3/b3sum/what_does_check_do.md
index 3a44a0010..3a44a0010 100644
--- a/3rdparty/BLAKE3/b3sum/what_does_check_do.md
+++ b/thirdparty/BLAKE3/b3sum/what_does_check_do.md
diff --git a/3rdparty/BLAKE3/benches/bench.rs b/thirdparty/BLAKE3/benches/bench.rs
index ba5a4041f..ba5a4041f 100644
--- a/3rdparty/BLAKE3/benches/bench.rs
+++ b/thirdparty/BLAKE3/benches/bench.rs
diff --git a/3rdparty/BLAKE3/build.rs b/thirdparty/BLAKE3/build.rs
index ea657d8db..ea657d8db 100644
--- a/3rdparty/BLAKE3/build.rs
+++ b/thirdparty/BLAKE3/build.rs
diff --git a/3rdparty/BLAKE3/c/.gitignore b/thirdparty/BLAKE3/c/.gitignore
index 0bf608cee..0bf608cee 100644
--- a/3rdparty/BLAKE3/c/.gitignore
+++ b/thirdparty/BLAKE3/c/.gitignore
diff --git a/3rdparty/BLAKE3/c/Makefile.testing b/thirdparty/BLAKE3/c/Makefile.testing
index 41e6b8285..41e6b8285 100644
--- a/3rdparty/BLAKE3/c/Makefile.testing
+++ b/thirdparty/BLAKE3/c/Makefile.testing
diff --git a/3rdparty/BLAKE3/c/README.md b/thirdparty/BLAKE3/c/README.md
index 5e8b4e682..5e8b4e682 100644
--- a/3rdparty/BLAKE3/c/README.md
+++ b/thirdparty/BLAKE3/c/README.md
diff --git a/3rdparty/BLAKE3/c/blake3.c b/thirdparty/BLAKE3/c/blake3.c
index 7abf5324e..7abf5324e 100644
--- a/3rdparty/BLAKE3/c/blake3.c
+++ b/thirdparty/BLAKE3/c/blake3.c
diff --git a/3rdparty/BLAKE3/c/blake3.h b/thirdparty/BLAKE3/c/blake3.h
index 57ebd5adc..57ebd5adc 100644
--- a/3rdparty/BLAKE3/c/blake3.h
+++ b/thirdparty/BLAKE3/c/blake3.h
diff --git a/3rdparty/BLAKE3/c/blake3_avx2.c b/thirdparty/BLAKE3/c/blake3_avx2.c
index c5a2ce9e2..c5a2ce9e2 100644
--- a/3rdparty/BLAKE3/c/blake3_avx2.c
+++ b/thirdparty/BLAKE3/c/blake3_avx2.c
diff --git a/3rdparty/BLAKE3/c/blake3_avx2_x86-64_unix.S b/thirdparty/BLAKE3/c/blake3_avx2_x86-64_unix.S
index 812bb8568..812bb8568 100644
--- a/3rdparty/BLAKE3/c/blake3_avx2_x86-64_unix.S
+++ b/thirdparty/BLAKE3/c/blake3_avx2_x86-64_unix.S
diff --git a/3rdparty/BLAKE3/c/blake3_avx2_x86-64_windows_gnu.S b/thirdparty/BLAKE3/c/blake3_avx2_x86-64_windows_gnu.S
index bb58d2ae6..bb58d2ae6 100644
--- a/3rdparty/BLAKE3/c/blake3_avx2_x86-64_windows_gnu.S
+++ b/thirdparty/BLAKE3/c/blake3_avx2_x86-64_windows_gnu.S
diff --git a/3rdparty/BLAKE3/c/blake3_avx2_x86-64_windows_msvc.asm b/thirdparty/BLAKE3/c/blake3_avx2_x86-64_windows_msvc.asm
index 352298edd..352298edd 100644
--- a/3rdparty/BLAKE3/c/blake3_avx2_x86-64_windows_msvc.asm
+++ b/thirdparty/BLAKE3/c/blake3_avx2_x86-64_windows_msvc.asm
diff --git a/3rdparty/BLAKE3/c/blake3_avx512.c b/thirdparty/BLAKE3/c/blake3_avx512.c
index 77a5c385c..77a5c385c 100644
--- a/3rdparty/BLAKE3/c/blake3_avx512.c
+++ b/thirdparty/BLAKE3/c/blake3_avx512.c
diff --git a/3rdparty/BLAKE3/c/blake3_avx512_x86-64_unix.S b/thirdparty/BLAKE3/c/blake3_avx512_x86-64_unix.S
index a06aede0f..a06aede0f 100644
--- a/3rdparty/BLAKE3/c/blake3_avx512_x86-64_unix.S
+++ b/thirdparty/BLAKE3/c/blake3_avx512_x86-64_unix.S
diff --git a/3rdparty/BLAKE3/c/blake3_avx512_x86-64_windows_gnu.S b/thirdparty/BLAKE3/c/blake3_avx512_x86-64_windows_gnu.S
index e10b9f36c..e10b9f36c 100644
--- a/3rdparty/BLAKE3/c/blake3_avx512_x86-64_windows_gnu.S
+++ b/thirdparty/BLAKE3/c/blake3_avx512_x86-64_windows_gnu.S
diff --git a/3rdparty/BLAKE3/c/blake3_avx512_x86-64_windows_msvc.asm b/thirdparty/BLAKE3/c/blake3_avx512_x86-64_windows_msvc.asm
index b19efbaae..b19efbaae 100644
--- a/3rdparty/BLAKE3/c/blake3_avx512_x86-64_windows_msvc.asm
+++ b/thirdparty/BLAKE3/c/blake3_avx512_x86-64_windows_msvc.asm
diff --git a/3rdparty/BLAKE3/c/blake3_c_rust_bindings/Cargo.toml b/thirdparty/BLAKE3/c/blake3_c_rust_bindings/Cargo.toml
index 2052c7458..2052c7458 100644
--- a/3rdparty/BLAKE3/c/blake3_c_rust_bindings/Cargo.toml
+++ b/thirdparty/BLAKE3/c/blake3_c_rust_bindings/Cargo.toml
diff --git a/3rdparty/BLAKE3/c/blake3_c_rust_bindings/README.md b/thirdparty/BLAKE3/c/blake3_c_rust_bindings/README.md
index c44726b90..c44726b90 100644
--- a/3rdparty/BLAKE3/c/blake3_c_rust_bindings/README.md
+++ b/thirdparty/BLAKE3/c/blake3_c_rust_bindings/README.md
diff --git a/3rdparty/BLAKE3/c/blake3_c_rust_bindings/benches/bench.rs b/thirdparty/BLAKE3/c/blake3_c_rust_bindings/benches/bench.rs
index 119bd2064..119bd2064 100644
--- a/3rdparty/BLAKE3/c/blake3_c_rust_bindings/benches/bench.rs
+++ b/thirdparty/BLAKE3/c/blake3_c_rust_bindings/benches/bench.rs
diff --git a/3rdparty/BLAKE3/c/blake3_c_rust_bindings/build.rs b/thirdparty/BLAKE3/c/blake3_c_rust_bindings/build.rs
index d5dc47a81..d5dc47a81 100644
--- a/3rdparty/BLAKE3/c/blake3_c_rust_bindings/build.rs
+++ b/thirdparty/BLAKE3/c/blake3_c_rust_bindings/build.rs
diff --git a/3rdparty/BLAKE3/c/blake3_c_rust_bindings/cross_test.sh b/thirdparty/BLAKE3/c/blake3_c_rust_bindings/cross_test.sh
index 94d50affb..94d50affb 100644
--- a/3rdparty/BLAKE3/c/blake3_c_rust_bindings/cross_test.sh
+++ b/thirdparty/BLAKE3/c/blake3_c_rust_bindings/cross_test.sh
diff --git a/3rdparty/BLAKE3/c/blake3_c_rust_bindings/src/lib.rs b/thirdparty/BLAKE3/c/blake3_c_rust_bindings/src/lib.rs
index f18fe123f..f18fe123f 100644
--- a/3rdparty/BLAKE3/c/blake3_c_rust_bindings/src/lib.rs
+++ b/thirdparty/BLAKE3/c/blake3_c_rust_bindings/src/lib.rs
diff --git a/3rdparty/BLAKE3/c/blake3_c_rust_bindings/src/test.rs b/thirdparty/BLAKE3/c/blake3_c_rust_bindings/src/test.rs
index b989ae9c4..b989ae9c4 100644
--- a/3rdparty/BLAKE3/c/blake3_c_rust_bindings/src/test.rs
+++ b/thirdparty/BLAKE3/c/blake3_c_rust_bindings/src/test.rs
diff --git a/3rdparty/BLAKE3/c/blake3_dispatch.c b/thirdparty/BLAKE3/c/blake3_dispatch.c
index 6518478e5..6518478e5 100644
--- a/3rdparty/BLAKE3/c/blake3_dispatch.c
+++ b/thirdparty/BLAKE3/c/blake3_dispatch.c
diff --git a/3rdparty/BLAKE3/c/blake3_impl.h b/thirdparty/BLAKE3/c/blake3_impl.h
index 86ab6aa25..86ab6aa25 100644
--- a/3rdparty/BLAKE3/c/blake3_impl.h
+++ b/thirdparty/BLAKE3/c/blake3_impl.h
diff --git a/3rdparty/BLAKE3/c/blake3_neon.c b/thirdparty/BLAKE3/c/blake3_neon.c
index 46691f526..46691f526 100644
--- a/3rdparty/BLAKE3/c/blake3_neon.c
+++ b/thirdparty/BLAKE3/c/blake3_neon.c
diff --git a/3rdparty/BLAKE3/c/blake3_portable.c b/thirdparty/BLAKE3/c/blake3_portable.c
index 062dd1b47..062dd1b47 100644
--- a/3rdparty/BLAKE3/c/blake3_portable.c
+++ b/thirdparty/BLAKE3/c/blake3_portable.c
diff --git a/3rdparty/BLAKE3/c/blake3_sse2.c b/thirdparty/BLAKE3/c/blake3_sse2.c
index 159296688..159296688 100644
--- a/3rdparty/BLAKE3/c/blake3_sse2.c
+++ b/thirdparty/BLAKE3/c/blake3_sse2.c
diff --git a/3rdparty/BLAKE3/c/blake3_sse2_x86-64_unix.S b/thirdparty/BLAKE3/c/blake3_sse2_x86-64_unix.S
index d144046ab..d144046ab 100644
--- a/3rdparty/BLAKE3/c/blake3_sse2_x86-64_unix.S
+++ b/thirdparty/BLAKE3/c/blake3_sse2_x86-64_unix.S
diff --git a/3rdparty/BLAKE3/c/blake3_sse2_x86-64_windows_gnu.S b/thirdparty/BLAKE3/c/blake3_sse2_x86-64_windows_gnu.S
index 494c0c6fd..494c0c6fd 100644
--- a/3rdparty/BLAKE3/c/blake3_sse2_x86-64_windows_gnu.S
+++ b/thirdparty/BLAKE3/c/blake3_sse2_x86-64_windows_gnu.S
diff --git a/3rdparty/BLAKE3/c/blake3_sse2_x86-64_windows_msvc.asm b/thirdparty/BLAKE3/c/blake3_sse2_x86-64_windows_msvc.asm
index 72deb7bbc..72deb7bbc 100644
--- a/3rdparty/BLAKE3/c/blake3_sse2_x86-64_windows_msvc.asm
+++ b/thirdparty/BLAKE3/c/blake3_sse2_x86-64_windows_msvc.asm
diff --git a/3rdparty/BLAKE3/c/blake3_sse41.c b/thirdparty/BLAKE3/c/blake3_sse41.c
index b31122533..b31122533 100644
--- a/3rdparty/BLAKE3/c/blake3_sse41.c
+++ b/thirdparty/BLAKE3/c/blake3_sse41.c
diff --git a/3rdparty/BLAKE3/c/blake3_sse41_x86-64_unix.S b/thirdparty/BLAKE3/c/blake3_sse41_x86-64_unix.S
index a3ff64269..a3ff64269 100644
--- a/3rdparty/BLAKE3/c/blake3_sse41_x86-64_unix.S
+++ b/thirdparty/BLAKE3/c/blake3_sse41_x86-64_unix.S
diff --git a/3rdparty/BLAKE3/c/blake3_sse41_x86-64_windows_gnu.S b/thirdparty/BLAKE3/c/blake3_sse41_x86-64_windows_gnu.S
index 60d0a4042..60d0a4042 100644
--- a/3rdparty/BLAKE3/c/blake3_sse41_x86-64_windows_gnu.S
+++ b/thirdparty/BLAKE3/c/blake3_sse41_x86-64_windows_gnu.S
diff --git a/3rdparty/BLAKE3/c/blake3_sse41_x86-64_windows_msvc.asm b/thirdparty/BLAKE3/c/blake3_sse41_x86-64_windows_msvc.asm
index 87001e4d3..87001e4d3 100644
--- a/3rdparty/BLAKE3/c/blake3_sse41_x86-64_windows_msvc.asm
+++ b/thirdparty/BLAKE3/c/blake3_sse41_x86-64_windows_msvc.asm
diff --git a/3rdparty/BLAKE3/c/example.c b/thirdparty/BLAKE3/c/example.c
index 02fe3c32b..02fe3c32b 100644
--- a/3rdparty/BLAKE3/c/example.c
+++ b/thirdparty/BLAKE3/c/example.c
diff --git a/3rdparty/BLAKE3/c/main.c b/thirdparty/BLAKE3/c/main.c
index 9b8a436f3..9b8a436f3 100644
--- a/3rdparty/BLAKE3/c/main.c
+++ b/thirdparty/BLAKE3/c/main.c
diff --git a/3rdparty/BLAKE3/c/test.py b/thirdparty/BLAKE3/c/test.py
index b0b192950..b0b192950 100644
--- a/3rdparty/BLAKE3/c/test.py
+++ b/thirdparty/BLAKE3/c/test.py
diff --git a/3rdparty/BLAKE3/lib/Linux_x64/libblake3.a b/thirdparty/BLAKE3/lib/Linux_x64/libblake3.a
index b956e22cb..b956e22cb 100644
--- a/3rdparty/BLAKE3/lib/Linux_x64/libblake3.a
+++ b/thirdparty/BLAKE3/lib/Linux_x64/libblake3.a
diff --git a/3rdparty/BLAKE3/lib/Win64/BLAKE3.lib b/thirdparty/BLAKE3/lib/Win64/BLAKE3.lib
index 1308d9928..1308d9928 100644
--- a/3rdparty/BLAKE3/lib/Win64/BLAKE3.lib
+++ b/thirdparty/BLAKE3/lib/Win64/BLAKE3.lib
diff --git a/3rdparty/BLAKE3/media/B3.svg b/thirdparty/BLAKE3/media/B3.svg
index a50da0ce9..a50da0ce9 100644
--- a/3rdparty/BLAKE3/media/B3.svg
+++ b/thirdparty/BLAKE3/media/B3.svg
diff --git a/3rdparty/BLAKE3/media/BLAKE3.svg b/thirdparty/BLAKE3/media/BLAKE3.svg
index 2d50c2d3b..2d50c2d3b 100644
--- a/3rdparty/BLAKE3/media/BLAKE3.svg
+++ b/thirdparty/BLAKE3/media/BLAKE3.svg
diff --git a/3rdparty/BLAKE3/media/speed.svg b/thirdparty/BLAKE3/media/speed.svg
index 7bd65ca3c..7bd65ca3c 100644
--- a/3rdparty/BLAKE3/media/speed.svg
+++ b/thirdparty/BLAKE3/media/speed.svg
diff --git a/3rdparty/BLAKE3/reference_impl/Cargo.toml b/thirdparty/BLAKE3/reference_impl/Cargo.toml
index 8c81e5ad9..8c81e5ad9 100644
--- a/3rdparty/BLAKE3/reference_impl/Cargo.toml
+++ b/thirdparty/BLAKE3/reference_impl/Cargo.toml
diff --git a/3rdparty/BLAKE3/reference_impl/README.md b/thirdparty/BLAKE3/reference_impl/README.md
index 941fafd72..941fafd72 100644
--- a/3rdparty/BLAKE3/reference_impl/README.md
+++ b/thirdparty/BLAKE3/reference_impl/README.md
diff --git a/3rdparty/BLAKE3/reference_impl/reference_impl.rs b/thirdparty/BLAKE3/reference_impl/reference_impl.rs
index 248834319..248834319 100644
--- a/3rdparty/BLAKE3/reference_impl/reference_impl.rs
+++ b/thirdparty/BLAKE3/reference_impl/reference_impl.rs
diff --git a/3rdparty/BLAKE3/src/ffi_avx2.rs b/thirdparty/BLAKE3/src/ffi_avx2.rs
index d805e868e..d805e868e 100644
--- a/3rdparty/BLAKE3/src/ffi_avx2.rs
+++ b/thirdparty/BLAKE3/src/ffi_avx2.rs
diff --git a/3rdparty/BLAKE3/src/ffi_avx512.rs b/thirdparty/BLAKE3/src/ffi_avx512.rs
index c1b9f649b..c1b9f649b 100644
--- a/3rdparty/BLAKE3/src/ffi_avx512.rs
+++ b/thirdparty/BLAKE3/src/ffi_avx512.rs
diff --git a/3rdparty/BLAKE3/src/ffi_neon.rs b/thirdparty/BLAKE3/src/ffi_neon.rs
index 889974277..889974277 100644
--- a/3rdparty/BLAKE3/src/ffi_neon.rs
+++ b/thirdparty/BLAKE3/src/ffi_neon.rs
diff --git a/3rdparty/BLAKE3/src/ffi_sse2.rs b/thirdparty/BLAKE3/src/ffi_sse2.rs
index c49a229ad..c49a229ad 100644
--- a/3rdparty/BLAKE3/src/ffi_sse2.rs
+++ b/thirdparty/BLAKE3/src/ffi_sse2.rs
diff --git a/3rdparty/BLAKE3/src/ffi_sse41.rs b/thirdparty/BLAKE3/src/ffi_sse41.rs
index 0b64c90a0..0b64c90a0 100644
--- a/3rdparty/BLAKE3/src/ffi_sse41.rs
+++ b/thirdparty/BLAKE3/src/ffi_sse41.rs
diff --git a/3rdparty/BLAKE3/src/guts.rs b/thirdparty/BLAKE3/src/guts.rs
index 88dcc86cd..88dcc86cd 100644
--- a/3rdparty/BLAKE3/src/guts.rs
+++ b/thirdparty/BLAKE3/src/guts.rs
diff --git a/3rdparty/BLAKE3/src/join.rs b/thirdparty/BLAKE3/src/join.rs
index 60932db1c..60932db1c 100644
--- a/3rdparty/BLAKE3/src/join.rs
+++ b/thirdparty/BLAKE3/src/join.rs
diff --git a/3rdparty/BLAKE3/src/lib.rs b/thirdparty/BLAKE3/src/lib.rs
index bf66b6dae..bf66b6dae 100644
--- a/3rdparty/BLAKE3/src/lib.rs
+++ b/thirdparty/BLAKE3/src/lib.rs
diff --git a/3rdparty/BLAKE3/src/platform.rs b/thirdparty/BLAKE3/src/platform.rs
index 4bd67de7a..4bd67de7a 100644
--- a/3rdparty/BLAKE3/src/platform.rs
+++ b/thirdparty/BLAKE3/src/platform.rs
diff --git a/3rdparty/BLAKE3/src/portable.rs b/thirdparty/BLAKE3/src/portable.rs
index 0a569cec7..0a569cec7 100644
--- a/3rdparty/BLAKE3/src/portable.rs
+++ b/thirdparty/BLAKE3/src/portable.rs
diff --git a/3rdparty/BLAKE3/src/rust_avx2.rs b/thirdparty/BLAKE3/src/rust_avx2.rs
index 6ab773ad4..6ab773ad4 100644
--- a/3rdparty/BLAKE3/src/rust_avx2.rs
+++ b/thirdparty/BLAKE3/src/rust_avx2.rs
diff --git a/3rdparty/BLAKE3/src/rust_sse2.rs b/thirdparty/BLAKE3/src/rust_sse2.rs
index 15b52ee5d..15b52ee5d 100644
--- a/3rdparty/BLAKE3/src/rust_sse2.rs
+++ b/thirdparty/BLAKE3/src/rust_sse2.rs
diff --git a/3rdparty/BLAKE3/src/rust_sse41.rs b/thirdparty/BLAKE3/src/rust_sse41.rs
index d5cf0f4a9..d5cf0f4a9 100644
--- a/3rdparty/BLAKE3/src/rust_sse41.rs
+++ b/thirdparty/BLAKE3/src/rust_sse41.rs
diff --git a/3rdparty/BLAKE3/src/test.rs b/thirdparty/BLAKE3/src/test.rs
index eefb1a354..eefb1a354 100644
--- a/3rdparty/BLAKE3/src/test.rs
+++ b/thirdparty/BLAKE3/src/test.rs
diff --git a/3rdparty/BLAKE3/src/traits.rs b/thirdparty/BLAKE3/src/traits.rs
index 9704e0106..9704e0106 100644
--- a/3rdparty/BLAKE3/src/traits.rs
+++ b/thirdparty/BLAKE3/src/traits.rs
diff --git a/3rdparty/BLAKE3/test_vectors/Cargo.toml b/thirdparty/BLAKE3/test_vectors/Cargo.toml
index cd74a9df0..cd74a9df0 100644
--- a/3rdparty/BLAKE3/test_vectors/Cargo.toml
+++ b/thirdparty/BLAKE3/test_vectors/Cargo.toml
diff --git a/3rdparty/BLAKE3/test_vectors/cross_test.sh b/thirdparty/BLAKE3/test_vectors/cross_test.sh
index c4d280c9d..c4d280c9d 100644
--- a/3rdparty/BLAKE3/test_vectors/cross_test.sh
+++ b/thirdparty/BLAKE3/test_vectors/cross_test.sh
diff --git a/3rdparty/BLAKE3/test_vectors/src/lib.rs b/thirdparty/BLAKE3/test_vectors/src/lib.rs
index 04460f668..04460f668 100644
--- a/3rdparty/BLAKE3/test_vectors/src/lib.rs
+++ b/thirdparty/BLAKE3/test_vectors/src/lib.rs
diff --git a/3rdparty/BLAKE3/test_vectors/test_vectors.json b/thirdparty/BLAKE3/test_vectors/test_vectors.json
index f6da91792..f6da91792 100644
--- a/3rdparty/BLAKE3/test_vectors/test_vectors.json
+++ b/thirdparty/BLAKE3/test_vectors/test_vectors.json
diff --git a/3rdparty/BLAKE3/tools/compiler_version/Cargo.toml b/thirdparty/BLAKE3/tools/compiler_version/Cargo.toml
index 1046cf29d..1046cf29d 100644
--- a/3rdparty/BLAKE3/tools/compiler_version/Cargo.toml
+++ b/thirdparty/BLAKE3/tools/compiler_version/Cargo.toml
diff --git a/3rdparty/BLAKE3/tools/compiler_version/build.rs b/thirdparty/BLAKE3/tools/compiler_version/build.rs
index 3e14ebe67..3e14ebe67 100644
--- a/3rdparty/BLAKE3/tools/compiler_version/build.rs
+++ b/thirdparty/BLAKE3/tools/compiler_version/build.rs
diff --git a/3rdparty/BLAKE3/tools/compiler_version/src/main.rs b/thirdparty/BLAKE3/tools/compiler_version/src/main.rs
index 767cb31bd..767cb31bd 100644
--- a/3rdparty/BLAKE3/tools/compiler_version/src/main.rs
+++ b/thirdparty/BLAKE3/tools/compiler_version/src/main.rs
diff --git a/3rdparty/BLAKE3/tools/instruction_set_support/Cargo.toml b/thirdparty/BLAKE3/tools/instruction_set_support/Cargo.toml
index 9e30174a9..9e30174a9 100644
--- a/3rdparty/BLAKE3/tools/instruction_set_support/Cargo.toml
+++ b/thirdparty/BLAKE3/tools/instruction_set_support/Cargo.toml
diff --git a/3rdparty/BLAKE3/tools/instruction_set_support/src/main.rs b/thirdparty/BLAKE3/tools/instruction_set_support/src/main.rs
index 6b509b053..6b509b053 100644
--- a/3rdparty/BLAKE3/tools/instruction_set_support/src/main.rs
+++ b/thirdparty/BLAKE3/tools/instruction_set_support/src/main.rs
diff --git a/3rdparty/Oodle/include/oodle2.h b/thirdparty/Oodle/include/oodle2.h
index 31204e932..31204e932 100644
--- a/3rdparty/Oodle/include/oodle2.h
+++ b/thirdparty/Oodle/include/oodle2.h
diff --git a/3rdparty/Oodle/include/oodle2base.h b/thirdparty/Oodle/include/oodle2base.h
index 05f73f3ea..05f73f3ea 100644
--- a/3rdparty/Oodle/include/oodle2base.h
+++ b/thirdparty/Oodle/include/oodle2base.h
diff --git a/3rdparty/Oodle/lib/Linux_x64/liboo2corelinux64.a b/thirdparty/Oodle/lib/Linux_x64/liboo2corelinux64.a
index dee0353e5..dee0353e5 100755
--- a/3rdparty/Oodle/lib/Linux_x64/liboo2corelinux64.a
+++ b/thirdparty/Oodle/lib/Linux_x64/liboo2corelinux64.a
diff --git a/3rdparty/Oodle/lib/Linux_x64/liboo2corelinux64.so.8 b/thirdparty/Oodle/lib/Linux_x64/liboo2corelinux64.so.8
index 425ada44d..425ada44d 100755
--- a/3rdparty/Oodle/lib/Linux_x64/liboo2corelinux64.so.8
+++ b/thirdparty/Oodle/lib/Linux_x64/liboo2corelinux64.so.8
diff --git a/3rdparty/Oodle/lib/Win64/oo2core_win64.lib b/thirdparty/Oodle/lib/Win64/oo2core_win64.lib
index ae42f727a..ae42f727a 100644
--- a/3rdparty/Oodle/lib/Win64/oo2core_win64.lib
+++ b/thirdparty/Oodle/lib/Win64/oo2core_win64.lib
diff --git a/thirdparty/licenses/README.md b/thirdparty/licenses/README.md
new file mode 100644
index 000000000..a4d8e1c97
--- /dev/null
+++ b/thirdparty/licenses/README.md
@@ -0,0 +1,3 @@
+# Placeholder
+
+Third party library license information goes here at some point in the near future.
diff --git a/3rdparty/utfcpp/.circleci/config.yml b/thirdparty/utfcpp/.circleci/config.yml
index b2cbdaf99..b2cbdaf99 100644
--- a/3rdparty/utfcpp/.circleci/config.yml
+++ b/thirdparty/utfcpp/.circleci/config.yml
diff --git a/3rdparty/utfcpp/.gitignore b/thirdparty/utfcpp/.gitignore
index 488d51dd9..488d51dd9 100644
--- a/3rdparty/utfcpp/.gitignore
+++ b/thirdparty/utfcpp/.gitignore
diff --git a/3rdparty/utfcpp/.gitmodules b/thirdparty/utfcpp/.gitmodules
index d2ac8470d..d2ac8470d 100644
--- a/3rdparty/utfcpp/.gitmodules
+++ b/thirdparty/utfcpp/.gitmodules
diff --git a/3rdparty/utfcpp/CMakeLists.txt b/thirdparty/utfcpp/CMakeLists.txt
index 4e63087bc..4e63087bc 100644
--- a/3rdparty/utfcpp/CMakeLists.txt
+++ b/thirdparty/utfcpp/CMakeLists.txt
diff --git a/3rdparty/utfcpp/LICENSE b/thirdparty/utfcpp/LICENSE
index 36b7cd93c..36b7cd93c 100644
--- a/3rdparty/utfcpp/LICENSE
+++ b/thirdparty/utfcpp/LICENSE
diff --git a/3rdparty/utfcpp/README.md b/thirdparty/utfcpp/README.md
index 0c689cf12..0c689cf12 100644
--- a/3rdparty/utfcpp/README.md
+++ b/thirdparty/utfcpp/README.md
diff --git a/3rdparty/utfcpp/samples/docsample.cpp b/thirdparty/utfcpp/samples/docsample.cpp
index 653388725..653388725 100644
--- a/3rdparty/utfcpp/samples/docsample.cpp
+++ b/thirdparty/utfcpp/samples/docsample.cpp
diff --git a/3rdparty/utfcpp/source/utf8.h b/thirdparty/utfcpp/source/utf8.h
index 82b13f59f..82b13f59f 100644
--- a/3rdparty/utfcpp/source/utf8.h
+++ b/thirdparty/utfcpp/source/utf8.h
diff --git a/3rdparty/utfcpp/source/utf8/checked.h b/thirdparty/utfcpp/source/utf8/checked.h
index 71b9076f6..71b9076f6 100644
--- a/3rdparty/utfcpp/source/utf8/checked.h
+++ b/thirdparty/utfcpp/source/utf8/checked.h
diff --git a/3rdparty/utfcpp/source/utf8/core.h b/thirdparty/utfcpp/source/utf8/core.h
index de6199f2a..de6199f2a 100644
--- a/3rdparty/utfcpp/source/utf8/core.h
+++ b/thirdparty/utfcpp/source/utf8/core.h
diff --git a/3rdparty/utfcpp/source/utf8/cpp11.h b/thirdparty/utfcpp/source/utf8/cpp11.h
index d93961b04..d93961b04 100644
--- a/3rdparty/utfcpp/source/utf8/cpp11.h
+++ b/thirdparty/utfcpp/source/utf8/cpp11.h
diff --git a/3rdparty/utfcpp/source/utf8/unchecked.h b/thirdparty/utfcpp/source/utf8/unchecked.h
index 0e1b51cc7..0e1b51cc7 100644
--- a/3rdparty/utfcpp/source/utf8/unchecked.h
+++ b/thirdparty/utfcpp/source/utf8/unchecked.h
diff --git a/3rdparty/utfcpp/tests/CMakeLists.txt b/thirdparty/utfcpp/tests/CMakeLists.txt
index 06e0d7e9c..06e0d7e9c 100644
--- a/3rdparty/utfcpp/tests/CMakeLists.txt
+++ b/thirdparty/utfcpp/tests/CMakeLists.txt
diff --git a/3rdparty/utfcpp/tests/docker/Dockerfile b/thirdparty/utfcpp/tests/docker/Dockerfile
index 125a26936..125a26936 100644
--- a/3rdparty/utfcpp/tests/docker/Dockerfile
+++ b/thirdparty/utfcpp/tests/docker/Dockerfile
diff --git a/3rdparty/utfcpp/tests/negative.cpp b/thirdparty/utfcpp/tests/negative.cpp
index f1bcc993e..f1bcc993e 100644
--- a/3rdparty/utfcpp/tests/negative.cpp
+++ b/thirdparty/utfcpp/tests/negative.cpp
diff --git a/3rdparty/utfcpp/tests/test_checked_api.cpp b/thirdparty/utfcpp/tests/test_checked_api.cpp
index 6787da62e..6787da62e 100644
--- a/3rdparty/utfcpp/tests/test_checked_api.cpp
+++ b/thirdparty/utfcpp/tests/test_checked_api.cpp
diff --git a/3rdparty/utfcpp/tests/test_checked_iterator.cpp b/thirdparty/utfcpp/tests/test_checked_iterator.cpp
index 4c44834fd..4c44834fd 100644
--- a/3rdparty/utfcpp/tests/test_checked_iterator.cpp
+++ b/thirdparty/utfcpp/tests/test_checked_iterator.cpp
diff --git a/3rdparty/utfcpp/tests/test_cpp11.cpp b/thirdparty/utfcpp/tests/test_cpp11.cpp
index edcff9d31..edcff9d31 100644
--- a/3rdparty/utfcpp/tests/test_cpp11.cpp
+++ b/thirdparty/utfcpp/tests/test_cpp11.cpp
diff --git a/3rdparty/utfcpp/tests/test_data/utf8_invalid.txt b/thirdparty/utfcpp/tests/test_data/utf8_invalid.txt
index ae8315932..ae8315932 100644
--- a/3rdparty/utfcpp/tests/test_data/utf8_invalid.txt
+++ b/thirdparty/utfcpp/tests/test_data/utf8_invalid.txt
diff --git a/3rdparty/utfcpp/tests/test_unchecked_api.cpp b/thirdparty/utfcpp/tests/test_unchecked_api.cpp
index e9f19ca6c..e9f19ca6c 100644
--- a/3rdparty/utfcpp/tests/test_unchecked_api.cpp
+++ b/thirdparty/utfcpp/tests/test_unchecked_api.cpp
diff --git a/3rdparty/utfcpp/tests/test_unchecked_iterator.cpp b/thirdparty/utfcpp/tests/test_unchecked_iterator.cpp
index 103e8e28a..103e8e28a 100644
--- a/3rdparty/utfcpp/tests/test_unchecked_iterator.cpp
+++ b/thirdparty/utfcpp/tests/test_unchecked_iterator.cpp
diff --git a/zen.sln b/zen.sln
index dec613b24..c1bced170 100644
--- a/zen.sln
+++ b/zen.sln
@@ -33,7 +33,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zen", "zen\zen.vcxproj", "{
 		{D75BF9AB-C61E-4FFF-AD59-1563430F05E2} = {D75BF9AB-C61E-4FFF-AD59-1563430F05E2}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3rdparty", "3rdparty", "{3CB3B9E8-B4CB-4D2E-821A-2AFE34093BEF}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "thirdparty", "thirdparty", "{3CB3B9E8-B4CB-4D2E-821A-2AFE34093BEF}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zenserver-test", "zenserver-test\zenserver-test.vcxproj", "{2563249E-E695-4CC4-8FFA-335D07680C9D}"
 	ProjectSection(ProjectDependencies) = postProject
diff --git a/zencore/blake3.cpp b/zencore/blake3.cpp
index 663f21b6d..8f8952271 100644
--- a/zencore/blake3.cpp
+++ b/zencore/blake3.cpp
@@ -7,7 +7,7 @@
 #include <zencore/testing.h>
 #include <zencore/zencore.h>
 
-#include "../3rdparty/BLAKE3/c/blake3.h"
+#include "../thirdparty/BLAKE3/c/blake3.h"
 #pragma comment(lib, "blake3.lib")
 
 #include <string.h>
diff --git a/zencore/compactbinary.cpp b/zencore/compactbinary.cpp
index aafb365f3..c6bf38b04 100644
--- a/zencore/compactbinary.cpp
+++ b/zencore/compactbinary.cpp
@@ -1854,11 +1854,11 @@ TEST_CASE("uson.json")
 			   << "ValueTwo";
 		CbObject Obj = Writer.Save();
 
-		StringBuilder<128>	   Sb;
-		const std::string_view JsonText = Obj.ToJson(Sb).ToView();
+		StringBuilder<128> Sb;
+		const char*		   JsonText = Obj.ToJson(Sb).Data();
 
 		std::string	 JsonError;
-		json11::Json Json = json11::Json::parse(JsonText.data(), JsonError);
+		json11::Json Json = json11::Json::parse(JsonText, JsonError);
 
 		const std::string ValueOne = Json["KeyOne"].string_value();
 		const std::string ValueTwo = Json["KeyTwo"].string_value();
@@ -1879,11 +1879,11 @@ TEST_CASE("uson.json")
 
 		CbObject Obj = Writer.Save();
 
-		StringBuilder<128>	   Sb;
-		const std::string_view JsonText = Obj.ToJson(Sb).ToView();
+		StringBuilder<128> Sb;
+		const char*		   JsonText = Obj.ToJson(Sb).Data();
 
 		std::string	 JsonError;
-		json11::Json Json = json11::Json::parse(JsonText.data(), JsonError);
+		json11::Json Json = json11::Json::parse(JsonText, JsonError);
 
 		const float	 FloatValue	 = float(Json["Float"].number_value());
 		const double DoubleValue = Json["Double"].number_value();
@@ -1904,11 +1904,11 @@ TEST_CASE("uson.json")
 
 		CbObject Obj = Writer.Save();
 
-		StringBuilder<128>	   Sb;
-		const std::string_view JsonText = Obj.ToJson(Sb).ToView();
+		StringBuilder<128> Sb;
+		const char*		   JsonText = Obj.ToJson(Sb).Data();
 
 		std::string	 JsonError;
-		json11::Json Json = json11::Json::parse(JsonText.data(), JsonError);
+		json11::Json Json = json11::Json::parse(JsonText, JsonError);
 
 		const double FloatValue	 = Json["FloatNan"].number_value();
 		const double DoubleValue = Json["DoubleNan"].number_value();
diff --git a/zencore/compress.cpp b/zencore/compress.cpp
index 4a8d116fa..4b6d83f6f 100644
--- a/zencore/compress.cpp
+++ b/zencore/compress.cpp
@@ -8,7 +8,7 @@
 #include <zencore/endian.h>
 #include <zencore/testing.h>
 
-#include "../3rdparty/Oodle/include/oodle2.h"
+#include "../thirdparty/Oodle/include/oodle2.h"
 #if ZEN_PLATFORM_WINDOWS
 #	pragma comment(lib, "oo2core_win64.lib")
 #endif
diff --git a/zencore/memory.cpp b/zencore/memory.cpp
index 14ea7ca1d..c94829276 100644
--- a/zencore/memory.cpp
+++ b/zencore/memory.cpp
@@ -186,13 +186,13 @@ TEST_CASE("MemoryView")
 {
 	{
 		uint8_t	   Array1[16] = {};
-		MemoryView View1 = MakeMemoryView(Array1);
+		MemoryView View1	  = MakeMemoryView(Array1);
 		CHECK(View1.GetSize() == 16);
 	}
 
 	{
 		uint32_t   Array2[16] = {};
-		MemoryView View2 = MakeMemoryView(Array2);
+		MemoryView View2	  = MakeMemoryView(Array2);
 		CHECK(View2.GetSize() == 64);
 	}
 
diff --git a/zencore/xmake.lua b/zencore/xmake.lua
index 0b0b51758..d26a9f922 100644
--- a/zencore/xmake.lua
+++ b/zencore/xmake.lua
@@ -2,8 +2,8 @@ target('zencore')
     set_kind("static")
     add_files("**.cpp")
     add_includedirs("include", {public=true})
-    add_includedirs("..\\3rdparty\\utfcpp\\source")
-    add_linkdirs("$(projectdir)/3rdparty/BLAKE3/lib/Win64", "$(projectdir)/3rdparty/Oodle/lib/Win64")
+    add_includedirs("..\\thirdparty\\utfcpp\\source")
+    add_linkdirs("$(projectdir)/thirdparty/BLAKE3/lib/Win64", "$(projectdir)/thirdparty/Oodle/lib/Win64")
     add_packages(
         "vcpkg::spdlog", 
         "vcpkg::fmt",
diff --git a/zencore/zencore.vcxproj b/zencore/zencore.vcxproj
index 95b9eace5..49e959b96 100644
--- a/zencore/zencore.vcxproj
+++ b/zencore/zencore.vcxproj
@@ -74,7 +74,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>.\include;..\3rdparty\utfcpp\source</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\include;..\thirdparty\utfcpp\source</AdditionalIncludeDirectories>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <LanguageStandard>stdcpplatest</LanguageStandard>
       <TreatWarningAsError>true</TreatWarningAsError>
@@ -95,7 +95,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>.\include;..\3rdparty\utfcpp\source</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\include;..\thirdparty\utfcpp\source</AdditionalIncludeDirectories>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <LanguageStandard>stdcpplatest</LanguageStandard>
       <TreatWarningAsError>true</TreatWarningAsError>
diff --git a/zenfs_common.props b/zenfs_common.props
index 67894b9e8..3d1b5e9c8 100644
--- a/zenfs_common.props
+++ b/zenfs_common.props
@@ -3,7 +3,7 @@
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(SolutionDir)\3rdparty\BLAKE3\lib\Win64;$(SolutionDir)\3rdparty\Oodle\lib\Win64</LibraryPath>
+    <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(SolutionDir)\thirdparty\BLAKE3\lib\Win64;$(SolutionDir)\thirdparty\Oodle\lib\Win64</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
diff --git a/zenserver-test/zenserver-test.cpp b/zenserver-test/zenserver-test.cpp
index 7b9b91466..fd1c010be 100644
--- a/zenserver-test/zenserver-test.cpp
+++ b/zenserver-test/zenserver-test.cpp
@@ -991,7 +991,7 @@ TEST_CASE("project.basic")
 			}
 		}
 
-		BaseUri << "/oplog/ps5";
+		BaseUri << "/oplog/foobar";
 
 		{
 			{
@@ -1007,7 +1007,7 @@ TEST_CASE("project.basic")
 
 				zen::CbObjectView ResponseObject = zen::CbFieldView(Response.text.data()).AsObjectView();
 
-				CHECK(ResponseObject["id"].AsString() == "ps5"sv);
+				CHECK(ResponseObject["id"].AsString() == "foobar"sv);
 				CHECK(ResponseObject["project"].AsString() == "test"sv);
 			}
 		}
@@ -1029,11 +1029,13 @@ TEST_CASE("project.basic")
 				"00010000"};
 			auto FileOid = zen::Oid::FromHexString(ChunkId);
 
+			std::filesystem::path ReliablePath = zen::GetRunningExecutablePath();
+
 			OpWriter.BeginArray("files");
 			OpWriter.BeginObject();
 			OpWriter << "id" << FileOid;
-			OpWriter << "clientpath" << __FILE__;
-			OpWriter << "serverpath" << __FILE__;
+			OpWriter << "clientpath" << ReliablePath.c_str();
+			OpWriter << "serverpath" << ReliablePath.c_str();
 			OpWriter.EndObject();
 			OpWriter.EndArray();
 
diff --git a/zenserver/cache/structuredcachestore.cpp b/zenserver/cache/structuredcachestore.cpp
index 119062833..8b9ce8ff9 100644
--- a/zenserver/cache/structuredcachestore.cpp
+++ b/zenserver/cache/structuredcachestore.cpp
@@ -325,27 +325,32 @@ inline DiskLocation::DiskLocation(uint64_t Offset, uint64_t ValueSize, uint32_t
 {
 }
 
-inline uint64_t DiskLocation::CombineOffsetAndFlags(uint64_t Offset, uint64_t Flags)
+inline uint64_t
+DiskLocation::CombineOffsetAndFlags(uint64_t Offset, uint64_t Flags)
 {
 	return Offset | Flags;
 }
 
-inline uint64_t DiskLocation::Offset() const
+inline uint64_t
+DiskLocation::Offset() const
 {
 	return OffsetAndFlags & kOffsetMask;
 }
 
-inline uint64_t DiskLocation::Size() const
+inline uint64_t
+DiskLocation::Size() const
 {
 	return LowerSize;
 }
 
-inline uint64_t DiskLocation::IsFlagSet(uint64_t Flag) const
+inline uint64_t
+DiskLocation::IsFlagSet(uint64_t Flag) const
 {
 	return OffsetAndFlags & Flag;
 }
 
-inline ZenContentType DiskLocation::GetContentType() const
+inline ZenContentType
+DiskLocation::GetContentType() const
 {
 	ZenContentType ContentType = ZenContentType::kBinary;
 
diff --git a/zenserver/cache/structuredcachestore.h b/zenserver/cache/structuredcachestore.h
index 6521d8393..0dfcbc5ca 100644
--- a/zenserver/cache/structuredcachestore.h
+++ b/zenserver/cache/structuredcachestore.h
@@ -112,9 +112,9 @@ struct DiskLocation
 	static const uint64_t kStructured	  = 0x4000'0000'0000'0000ull;
 	static const uint64_t kTombStone	  = 0x2000'0000'0000'0000ull;
 
-					DiskLocation();
-					DiskLocation(uint64_t Offset, uint64_t ValueSize, uint32_t IndexSize, uint64_t Flags);
-	static uint64_t	CombineOffsetAndFlags(uint64_t Offset, uint64_t Flags);
+	DiskLocation();
+	DiskLocation(uint64_t Offset, uint64_t ValueSize, uint32_t IndexSize, uint64_t Flags);
+	static uint64_t CombineOffsetAndFlags(uint64_t Offset, uint64_t Flags);
 	uint64_t		Offset() const;
 	uint64_t		Size() const;
 	uint64_t		IsFlagSet(uint64_t Flag) const;
diff --git a/zenserver/upstream/upstreamcache.cpp b/zenserver/upstream/upstreamcache.cpp
index b486b751c..174c3d17a 100644
--- a/zenserver/upstream/upstreamcache.cpp
+++ b/zenserver/upstream/upstreamcache.cpp
@@ -262,7 +262,7 @@ namespace detail {
 			using namespace fmt::literals;
 
 			ZEN_ASSERT(CacheRecord.PayloadIds.size() == Payloads.size());
-			const size_t MaxAttempts = 3;
+			const int32_t MaxAttempts = 3;
 
 			try
 			{
@@ -307,7 +307,7 @@ namespace detail {
 							const size_t Idx = std::distance(std::begin(CacheRecord.PayloadIds), It);
 
 							CloudCacheResult BlobResult;
-							for (size_t Attempt = 0; Attempt < MaxAttempts && !BlobResult.Success; Attempt++)
+							for (int32_t Attempt = 0; Attempt < MaxAttempts && !BlobResult.Success; Attempt++)
 							{
 								BlobResult = Session.PutCompressedBlob(CacheRecord.PayloadIds[Idx], Payloads[Idx]);
 							}
@@ -726,7 +726,7 @@ namespace detail {
 													  std::span<IoBuffer const>	 Payloads) override
 		{
 			ZEN_ASSERT(CacheRecord.PayloadIds.size() == Payloads.size());
-			const uint32_t MaxAttempts = 3;
+			const int32_t MaxAttempts = 3;
 
 			try
 			{