Fix issue with cpu_id and numa_code captured too early