Fixes for Windows SDK 11 #511

Job	Run time
OSX-x86-64 (Debug)	7s
Windows-MSYS2 (mingw64, x86_64, Debug)	1m 28s
OSX-x86-64 (Release)	6s
Windows-MSVC (amd64_x86, Debug)	1m 10s
Linux-GCC (x86_64, Debug)	15s
Windows-MSYS2 (mingw32, i686, Release)	1m 17s
Windows-MSVC (amd64_x86, Release)	1m 9s
Windows-MSYS2 (ucrt64, ucrt-x86_64, Debug)	1m 44s
Linux-GCC (x86_64, Release)	8s
Windows-MSVC (amd64, Debug)	1m 12s
Windows-MSYS2 (clang64, clang-x86_64, Release)	1m 44s
Linux-GCC (i686, Debug)	25s
Windows-MSVC (amd64, Release)	1m 11s
Linux-GCC (i686, Release)	29s
	12m 25s

Provide feedback