Fixup perf on FF and Safari