Summary: Fix compilation error and use of an outdated VM option in the test
Reviewed-by: stefank, jwilhelm