diff --git a/aarch64/corefreq-cli.c b/aarch64/corefreq-cli.c
index d83a8de4..b3973101 100644
--- a/aarch64/corefreq-cli.c
+++ b/aarch64/corefreq-cli.c
@@ -4417,12 +4417,12 @@ void Instructions(unsigned int iter)
 ASCII* Topology_Std(char *pStr, unsigned int cpu)
 {
     if (RO(Shm)->Cpu[cpu].Topology.BSP) {
-	StrFormat(&pStr[ 0], 4+(2*11)+1, "%03u:BSP%5d\x20",
+	StrFormat(&pStr[ 0], 4+(2*11)+1, "%03u:BSP%5X\x20",
 			cpu,
 			RO(Shm)->Cpu[cpu].Topology.MPID);
 	return RSC(TOPOLOGY_BSP_COMM).CODE();
     } else {
-	StrFormat(&pStr[ 0], 1+(3*11)+1, "%03u:%3d%5d\x20",
+	StrFormat(&pStr[ 0], 1+(3*11)+1, "%03u:%3d%5X\x20",
 			cpu,
 			RO(Shm)->Cpu[cpu].Topology.PackageID,
 			RO(Shm)->Cpu[cpu].Topology.MPID);
diff --git a/aarch64/corefreqk.c b/aarch64/corefreqk.c
index d7137362..a51ec8c4 100644
--- a/aarch64/corefreqk.c
+++ b/aarch64/corefreqk.c
@@ -1505,12 +1505,17 @@ static void Map_Generic_Topology(void *arg)
 		:
 		: "memory"
 	);
-	Core->T.MPID = mpid.value & 0xfffff;
-	Core->T.Cluster.CMP = mpid.Aff3;
-	Core->T.PackageID = mpid.Aff2;
-	Core->T.CoreID = mpid.Aff1;
 	if (mpid.MT) {
+		Core->T.MPID = mpid.value & 0xfffff;
+		Core->T.Cluster.CMP = mpid.Aff3;
+		Core->T.PackageID = mpid.Aff2;
+		Core->T.CoreID = mpid.Aff1;
 		Core->T.ThreadID = mpid.Aff0;
+	} else {
+		Core->T.MPID = mpid.value & 0xfffff;
+		Core->T.PackageID = mpid.Aff2;
+		Core->T.Cluster.CMP = mpid.Aff1;
+		Core->T.CoreID = mpid.Aff0;
 	}
 	Cache_Topology(Core);
     }