Improved profiling of a few functions a bit