Collect small fixes from stale contributor PRs #673

Job	Run time
Format, compilation and lint check	1m 29s
run unit tests (unit-race)	8m 24s
run unit tests (unit-cover)	2m 52s
	12m 45s

Provide feedback