Misc fixes #425

Job	Run time
Test in Ubuntu VM (22.04)	1m 38s
Build in containers (almalinux, 9)	7m 12s
Build in containers (almalinux, 8)	6m 1s
Build in containers (alpine, 3.17, -lts)	1m 41s
Test in Ubuntu VM (20.04)	1m 8s
Build in containers (alpine, 3.17, -virt)	1m 2s
Build in containers (alpine, 3.16, -lts)	1m 43s
Build in containers (alpine, 3.16, -virt)	1m 2s
Build in containers (alpine, 3.15, -lts)	1m 41s
Build in containers (alpine, 3.15, -virt)	1m 1s
Build in containers (archlinux, latest)	1m 33s
Build in containers (archlinux, latest, -lts)	1m 36s
Build in containers (archlinux, latest, -zen)	1m 32s
Build in containers (centos/centos, stream9, quay.io/)	7m 33s
Build in containers (centos/centos, stream8, quay.io/)	6m 23s
Build in containers (centos, 7)	4m 58s
Build in containers (debian, 12)	1m 17s
Build in containers (debian, 11)	1m 29s
Build in containers (debian, 10)	1m 37s
Build in containers (gentoo/stage3, latest)	5m 51s
Build in containers (ubuntu, 22.04)	1m 58s
Build in containers (ubuntu, 20.04)	2m 17s
Build in containers (ubuntu, 18.04)	2m 1s
	1h 4m 14s

Provide feedback