More profiling improvements