Improve profiler a bit