Fix various #1398

Job	Run time
build-ubuntu-dep-apt (ubuntu-20.04, /usr/bin/gcc-9, /usr/bin/g++-9, 11)	25m 43s
build-ubuntu-dep-apt (ubuntu-20.04, /usr/bin/gcc-9, /usr/bin/g++-9, 14)	26m 37s
build-ubuntu-dep-apt (ubuntu-20.04, /usr/bin/gcc-9, /usr/bin/g++-9, 17)	28m 52s
build-ubuntu-dep-apt (ubuntu-20.04, /usr/bin/gcc-10, /usr/bin/g++-10, 11)	23m 25s
build-ubuntu-dep-apt (ubuntu-20.04, /usr/bin/gcc-10, /usr/bin/g++-10, 14)	23m 55s
build-ubuntu-dep-apt (ubuntu-20.04, /usr/bin/gcc-10, /usr/bin/g++-10, 17)	25m 44s
build-ubuntu-dep-apt (ubuntu-20.04, /usr/bin/clang, /usr/bin/clang++, 11)	30m 32s
build-ubuntu-dep-apt (ubuntu-20.04, /usr/bin/clang, /usr/bin/clang++, 14)	32m 13s
build-ubuntu-dep-apt (ubuntu-20.04, /usr/bin/clang, /usr/bin/clang++, 17)	32m 58s
build-ubuntu-dep-apt (ubuntu-22.04, /usr/bin/gcc-9, /usr/bin/g++-9, 11)	22m 1s
build-ubuntu-dep-apt (ubuntu-22.04, /usr/bin/gcc-9, /usr/bin/g++-9, 14)	22m 28s
build-ubuntu-dep-apt (ubuntu-22.04, /usr/bin/gcc-9, /usr/bin/g++-9, 17)	25m 45s
build-ubuntu-dep-apt (ubuntu-22.04, /usr/bin/gcc-10, /usr/bin/g++-10, 11)	23m 50s
build-ubuntu-dep-apt (ubuntu-22.04, /usr/bin/gcc-10, /usr/bin/g++-10, 14)	23m 59s
build-ubuntu-dep-apt (ubuntu-22.04, /usr/bin/gcc-10, /usr/bin/g++-10, 17)	27m 1s
build-ubuntu-dep-apt (ubuntu-22.04, /usr/bin/clang, /usr/bin/clang++, 11)	32m 43s
build-ubuntu-dep-apt (ubuntu-22.04, /usr/bin/clang, /usr/bin/clang++, 14)	33m 32s
build-ubuntu-dep-apt (ubuntu-22.04, /usr/bin/clang, /usr/bin/clang++, 17)	36m 23s
	8h 17m 41s

Provide feedback