diff --git a/connector/collector/docker.go b/connector/collector/docker.go
index 68a1274..46cd499 100644
--- a/connector/collector/docker.go
+++ b/connector/collector/docker.go
@@ -76,7 +76,10 @@ func (c *Docker) Stop() {
 }
 
 func (c *Docker) ReadCPU(stats *api.Stats) {
-	ncpus := uint8(len(stats.CPUStats.CPUUsage.PercpuUsage))
+	ncpus := uint8(stats.CPUStats.OnlineCPUs)
+	if ncpus == 0 {
+		ncpus = uint8(len(stats.CPUStats.CPUUsage.PercpuUsage))
+	}
 	total := float64(stats.CPUStats.CPUUsage.TotalUsage)
 	system := float64(stats.CPUStats.SystemCPUUsage)
 
diff --git a/container/main.go b/container/main.go
index 8b59a50..fd38215 100644
--- a/container/main.go
+++ b/container/main.go
@@ -31,10 +31,14 @@ type Container struct {
 
 func New(id string, collector collector.Collector, manager manager.Manager) *Container {
 	widgets := compact.NewCompactRow()
+	shortID := id
+	if len(shortID) > 12 {
+		shortID = shortID[0:12]
+	}
 	return &Container{
 		Metrics:   models.NewMetrics(),
 		Id:        id,
-		Meta:      models.NewMeta("id", id[:12]),
+		Meta:      models.NewMeta("id", shortID),
 		Widgets:   widgets,
 		updater:   widgets,
 		collector: collector,