Final benchmark fixes