more tweaks to the counting of cores and sockets