diff --git a/AffinityPanel.c b/AffinityPanel.c
index 9c2a6e7c..e491b524 100644
--- a/AffinityPanel.c
+++ b/AffinityPanel.c
@@ -294,7 +294,7 @@ static MaskItem* AffinityPanel_addObject(AffinityPanel* this, hwloc_obj_t obj, u
       //left -= len;
    }
 
-   xSnprintf(buf, 64, "%s %s%u", type_name, index_prefix, index);
+   xSnprintf(buf, sizeof(buf), "%s %s%u", type_name, index_prefix, index);
 
    MaskItem* item = MaskItem_newMask(buf, indent_buf, obj->complete_cpuset, false);
    if (parent)
diff --git a/AvailableMetersPanel.c b/AvailableMetersPanel.c
index 33006e94..ce012557 100644
--- a/AvailableMetersPanel.c
+++ b/AvailableMetersPanel.c
@@ -119,7 +119,7 @@ AvailableMetersPanel* AvailableMetersPanel_new(Settings* settings, Header* heade
       Panel_add(super, (Object*) ListItem_new("CPU average", 0));
       for (int i = 1; i <= cpus; i++) {
          char buffer[50];
-         xSnprintf(buffer, 50, "%s %d", type->uiName, Settings_cpuId(this->settings, i - 1));
+         xSnprintf(buffer, sizeof(buffer), "%s %d", type->uiName, Settings_cpuId(this->settings, i - 1));
          Panel_add(super, (Object*) ListItem_new(buffer, i));
       }
    } else {
diff --git a/Header.c b/Header.c
index 0b522f54..e1049752 100644
--- a/Header.c
+++ b/Header.c
@@ -69,11 +69,11 @@ void Header_writeBackToSettings(const Header* this) {
 
       for (int i = 0; i < len; i++) {
          Meter* meter = (Meter*) Vector_get(vec, i);
-         char* name = xCalloc(64, sizeof(char));
+         char* name;
          if (meter->param) {
-            xSnprintf(name, 63, "%s(%d)", As_Meter(meter)->name, meter->param);
+            xAsprintf(&name, "%s(%d)", As_Meter(meter)->name, meter->param);
          } else {
-            xSnprintf(name, 63, "%s", As_Meter(meter)->name);
+            xAsprintf(&name, "%s", As_Meter(meter)->name);
          }
          colSettings->names[i] = name;
          colSettings->modes[i] = meter->mode;
diff --git a/Meter.c b/Meter.c
index 79421fb0..e295e72a 100644
--- a/Meter.c
+++ b/Meter.c
@@ -134,20 +134,20 @@ void Meter_setMode(Meter* this, int modeIndex) {
 }
 
 ListItem* Meter_toListItem(Meter* this, bool moving) {
-   char mode[21];
+   char mode[20];
    if (this->mode) {
-      xSnprintf(mode, 20, " [%s]", Meter_modes[this->mode]->uiName);
+      xSnprintf(mode, sizeof(mode), " [%s]", Meter_modes[this->mode]->uiName);
    } else {
       mode[0] = '\0';
    }
-   char number[11];
+   char number[10];
    if (this->param > 0) {
-      xSnprintf(number, 10, " %d", this->param);
+      xSnprintf(number, sizeof(number), " %d", this->param);
    } else {
       number[0] = '\0';
    }
-   char buffer[51];
-   xSnprintf(buffer, 50, "%s%s%s", Meter_uiName(this), number, mode);
+   char buffer[50];
+   xSnprintf(buffer, sizeof(buffer), "%s%s%s", Meter_uiName(this), number, mode);
    ListItem* li = ListItem_new(buffer, 0);
    li->moving = moving;
    return li;
diff --git a/SignalsPanel.c b/SignalsPanel.c
index 7937c5dc..436fc579 100644
--- a/SignalsPanel.c
+++ b/SignalsPanel.c
@@ -35,7 +35,7 @@ Panel* SignalsPanel_new() {
       static char buf[16];
       for (int sig = SIGRTMIN; sig <= SIGRTMAX; i++, sig++) {
          int n = sig - SIGRTMIN;
-         xSnprintf(buf, 16, "%2d SIGRTMIN%-+3d", sig, n);
+         xSnprintf(buf, sizeof(buf), "%2d SIGRTMIN%-+3d", sig, n);
          if (n == 0) {
             buf[11] = '\0';
          }
diff --git a/linux/Platform.c b/linux/Platform.c
index 82354717..ff4fcf69 100644
--- a/linux/Platform.c
+++ b/linux/Platform.c
@@ -476,8 +476,8 @@ FileLocks_ProcessData* Platform_getProcessLocks(pid_t pid) {
 
 void Platform_getPressureStall(const char* file, bool some, double* ten, double* sixty, double* threehundred) {
    *ten = *sixty = *threehundred = 0;
-   char procname[128 + 1];
-   xSnprintf(procname, 128, PROCDIR "/pressure/%s", file);
+   char procname[128];
+   xSnprintf(procname, sizeof(procname), PROCDIR "/pressure/%s", file);
    FILE* fd = fopen(procname, "r");
    if (!fd) {
       *ten = *sixty = *threehundred = NAN;