Profiler improvements