more portability fixes #2636

Job	Run time
CPU (Windows) (msvc, Debug)	8m 29s
macos-CPU (MacOS) (clang, Release)	3m 21s
macos-CPU (MacOS) (clang, Debug)	3m 54s
CPU (Windows) (msvc, Release)	10m 3s
CPU (clang 16, Release, ASAN)	3m 3s
CPU (gcc 12, Release, TSAN)	2m 56s
CPU (gcc 11, Release, ASAN)	3m 9s
CPU (gcc 13, Debug)	2m 22s
CPU (gcc 11, Release)	2m 21s
CPU (clang 16, Debug)	2m 40s
CPU (gcc 11, Debug)	2m 21s
CPU (clang 16, Release)	2m 39s
CI (CPU)	4s
CI (CPU) (MacOS)	5s
CI (CPU) (Windows)	0s
	47m 27s

Provide feedback