Prepare for SPSA tuning.
Some fixes.
bench: 7328585