Minor updates to qa/bench infrastructure.