more fixes to benchmark