More benchmark panel fixes and tweaks.