Misc fixes and cleanup #1489

Job	Run time
check-trigger	3s
unit-test / Build infix x86_64	1m 48s
build-x86_64 / Build infix x86_64	26m 41s
build-aarch64 / Build infix aarch64	27m 7s
build-arm / Build infix arm	18m 32s
test-run-x86_64 / Regression Test infix x86_64	1h 19m 37s
test-publish-x86_64	0s
	2h 33m 48s

Provide feedback