Small profiler fixes