More benchmark fixes