A few more perf things...