More profiling patches