More DOS updates #2406

Job	Run time
msys2-build-test (CLANG64, windows-latest)	7m 36s
msys2-build-test (UCRT64, windows-latest)	9m 6s
msys2-build-test (MINGW64, windows-latest)	9m 0s
msys2-build-test (CLANGARM64, windows-11-arm)	10m 17s
	35m 59s

Provide feedback