Fix various #2044

Job	Run time
build-ubuntu-dep-apt (ubuntu-20.04, /usr/bin/gcc-9, /usr/bin/g++-9, 98)	8m 50s
build-ubuntu-dep-apt (ubuntu-20.04, /usr/bin/gcc-9, /usr/bin/g++-9, 11)	28m 45s
build-ubuntu-dep-apt (ubuntu-20.04, /usr/bin/gcc-9, /usr/bin/g++-9, 17)	31m 37s
build-ubuntu-dep-apt (ubuntu-20.04, /usr/bin/gcc-10, /usr/bin/g++-10, 98)	8m 11s
build-ubuntu-dep-apt (ubuntu-20.04, /usr/bin/gcc-10, /usr/bin/g++-10, 11)	26m 32s
build-ubuntu-dep-apt (ubuntu-20.04, /usr/bin/gcc-10, /usr/bin/g++-10, 17)	28m 3s
build-ubuntu-dep-apt (ubuntu-20.04, /usr/bin/clang, /usr/bin/clang++, 98)	9m 16s
build-ubuntu-dep-apt (ubuntu-20.04, /usr/bin/clang, /usr/bin/clang++, 11)	33m 48s
build-ubuntu-dep-apt (ubuntu-20.04, /usr/bin/clang, /usr/bin/clang++, 17)	35m 50s
build-ubuntu-dep-apt (ubuntu-22.04, /usr/bin/gcc-9, /usr/bin/g++-9, 98)	7m 15s
build-ubuntu-dep-apt (ubuntu-22.04, /usr/bin/gcc-9, /usr/bin/g++-9, 11)	25m 41s
build-ubuntu-dep-apt (ubuntu-22.04, /usr/bin/gcc-9, /usr/bin/g++-9, 17)	27m 44s
build-ubuntu-dep-apt (ubuntu-22.04, /usr/bin/gcc-10, /usr/bin/g++-10, 98)	8m 4s
build-ubuntu-dep-apt (ubuntu-22.04, /usr/bin/gcc-10, /usr/bin/g++-10, 11)	26m 14s
build-ubuntu-dep-apt (ubuntu-22.04, /usr/bin/gcc-10, /usr/bin/g++-10, 17)	29m 8s
build-ubuntu-dep-apt (ubuntu-22.04, /usr/bin/clang, /usr/bin/clang++, 98)	9m 54s
build-ubuntu-dep-apt (ubuntu-22.04, /usr/bin/clang, /usr/bin/clang++, 11)	35m 59s
build-ubuntu-dep-apt (ubuntu-22.04, /usr/bin/clang, /usr/bin/clang++, 17)	40m 40s
	7h 1m 31s

Provide feedback