Small fixes for DOS #2280

Job	Run time
msys2-build-test (CLANG64, windows-latest)	6m 44s
msys2-build-test (UCRT64, windows-latest)	9m 35s
msys2-build-test (MINGW64, windows-latest)	8m 50s
msys2-build-test (CLANGARM64, windows-11-arm)	10m 57s
	36m 6s

Provide feedback