fix more issues #2378

Job	Run time
clang-sanitizers (,thread)	2m 27s
downstream	40m 11s
clang-sanitizers (,address,undefined)	1m 55s
linux-compiler-compat (clang-3)	1m 58s
linux-compiler-compat (clang-6)	5m 52s
linux-compiler-compat (clang-8)	6m 23s
linux-no-cpu-extensions	1m 34s
linux-compat (manylinux1-x64)	1m 11s
linux-shared-libs	1m 33s
linux-compiler-compat (clang-9)	6m 5s
linux-compat (manylinux1-x86)	1m 26s
linux-compat (manylinux2014-x64)	1m 25s
linux-compiler-compat (clang-10)	3m 53s
windows	2m 40s
linux-compat (manylinux2014-x86)	1m 30s
linux-compiler-compat (clang-11)	2m 9s
windows-vc16 (x86)	2m 35s
linux-compat (raspbian-bullseye)	7m 0s
linux-compiler-compat (gcc-4.8)	1m 17s
windows-vc16 (x64)	4m 4s
linux-compiler-compat (gcc-5)	1m 35s
linux-compat (fedora-34-x64)	1m 39s
linux-compiler-compat (gcc-6)	1m 52s
linux-compat (opensuse-leap)	1m 33s
linux-compiler-compat (gcc-7)	1m 47s
linux-compat (rhel8-x64)	1m 19s
linux-compiler-compat (gcc-8)	1m 46s
linux-compat (al2-x64)	1m 14s
linux-compiler-compat (gcc-11)	1m 51s
Cross Compile linux-armv6	1m 52s
freebsd	9m 27s
Cross Compile linux-armv7	1m 54s
linux-debug	1m 41s
Cross Compile linux-arm64	1m 57s
Cross Compile android-armv7	2m 10s
macos	1m 36s
macos-no-cpu-extensions	1m 20s
macos-x64	2m 30s
openbsd	12m 58s
windows-app-verifier	22m 21s
windows-no-cpu-extensions	2m 16s
windows-shared-libs	2m 31s
windows-vc14 (x86)	1m 21s
windows-vc15 (x86)	1m 50s
windows-vc14 (x64)	2m 7s
windows-vc15 (x64)	2m 25s
macos-debug	1m 32s
windows-debug	2m 41s
	3h 8m 13s

Provide feedback