Follow up fixes to r62282 #29860

Job	Run time
Core running from src / Linux	2m 16s
Core running from build / Linux	2m 24s
Core running from src / Windows	3m 33s
Core running from src / MacOS	2m 18s
Core running from build / Windows	3m 39s
Core running from build / MacOS	2m 24s
Slack Notifications	0s
Failed workflow tasks	0s
	16m 34s

Provide feedback