Some more perf tweak attempts