fix: FDv2 fixes surfaced by v3 contract test harness #1940

Job	Run time
contract-tests-curl	4m 56s
build-test-server-windows	18m 15s
build-test-server-curl	8m 15s
build-test-server-mac-curl	6m 36s
build-test-server-windows-curl	16m 22s
build-test-server	6m 57s
contract-tests	4m 34s
build-test-server-mac	7m 38s
	1h 13m 33s

Provide feedback