CPU counting fixups