Small fixes for non-fully-parallel sweep #12641

Job	Run time
omnibus compilations, trigger	2s
omnibus compilations, #10	5m 14s
omnibus compilations, #12	5m 8s
omnibus compilations, #6	4m 45s
omnibus compilations, #8	4m 59s
omnibus compilations, #5	4m 53s
omnibus compilations, #3	5m 5s
omnibus compilations, #2	8m 46s
omnibus compilations, #9	4m 22s
omnibus compilations, #11	4m 58s
omnibus compilations, #7	4m 32s
omnibus compilations, #4	5m 6s
omnibus compilations, #1	29m 59s
omnibus compilations, result	9s
	1h 27m 58s

Provide feedback