Improve profiler a little