[COMMIT] Minor changes to profile code