More 2D benchmark tweaks