Various fixups #2505

Job	Run time
Lints	2m 31s
build-aarch64-darwin / Build aarch64 Darwin	7m 44s
build-aarch64-linux / Build aarch64 Linux (static)	10m 1s
build-x86_64-darwin / Build x86_64 Darwin	11m 10s
build-x86_64-linux / Build x86_64 Linux (static)	6m 38s
Run aarch64 Darwin (--determinate)	2m 20s
Run aarch64 Darwin	2m 27s
Run x86_64 Linux (No init, --determinate)	1m 34s
Run x86_64 Linux (--determinate)	1m 51s
Run x86_64 Linux (No init)	1m 17s
Run x86_64 Linux release checks	0s
Run x86_64 Linux	1m 49s
Run x86_64 Darwin (--determinate)	5m 47s
Run x86_64 Darwin	6m 1s
Run aarch64 Linux (--determinate)	1m 35s
Run aarch64 Linux	1m 15s
	1h 4m 0s

Provide feedback