more benchmark fixes