Miscellaneous fixes #1058

Job	Run time
build-minimal-sysroots (x86_64)	52s
build-minimal-sysroots (riscv64)	1m 8s
build-minimal-sysroots (arm64)	56s
build-toolchains (ubuntu-latest, x86_64, gnu)	5m 10s
build-toolchains (ubuntu-latest, riscv64, gnu)	38s
build-toolchains (ubuntu-latest, arm64, gnu)	35s
build-toolchains (ubuntu-20.04, x86_64, gnu)	33s
build-toolchains (ubuntu-20.04, riscv64, gnu)	37s
build-toolchains (ubuntu-20.04, arm64, gnu)	27s
build-toolchains (macos-latest, x86_64, gnu)	1m 13s
build-toolchains (macos-latest, riscv64, gnu)	1m 2s
build-toolchains (macos-latest, arm64, gnu)	53s
build-toolchains (ubuntu-latest, llvm, all)	1m 8s
build-llvm-riscv64	2m 53s
build-arm64	3m 9s
build-llvm	3m 2s
build-llvm-arm64	2m 28s
build	3m 16s
build-riscv	2m 29s
run-riscv	0s
run-riscv64-llvm	0s
run-x86_64	0s
run-x86_64-llvm	0s
	32m 29s

Provide feedback