mtbench fixups

Change-Id: I60fa15969214b0d9507f8f371e644c610841f541