Profiler fixes