Collect small fixes from stale contributor PRs #672

Job	Run time
Format, compilation and lint check	1m 39s
run unit tests (unit-race)	5m 16s
run unit tests (unit-cover)	1m 59s
	8m 54s

Provide feedback