Minor tweaks to profiler