More work on perf tools