diff --git a/sysdeps/linux/ChangeLog b/sysdeps/linux/ChangeLog
index b8f5a373..2a65c200 100644
--- a/sysdeps/linux/ChangeLog
+++ b/sysdeps/linux/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-24  Benoît Dejean  <tazforever@dlfp.org>
+
+	* loadavg.c: (glibtop_get_loadavg_s):
+	* msg_limits.c: (glibtop_get_msg_limits_s):
+	* shm_limits.c: (glibtop_get_shm_limits_s): Small cleanup.
+
 2004-09-23  Benoît Dejean  <tazforever@dlfp.org>
 
 	* glibtop_server.c:
diff --git a/sysdeps/linux/loadavg.c b/sysdeps/linux/loadavg.c
index 61b5006d..7a96c95e 100644
--- a/sysdeps/linux/loadavg.c
+++ b/sysdeps/linux/loadavg.c
@@ -62,7 +62,7 @@ glibtop_get_loadavg_s (glibtop *server, glibtop_loadavg *buf)
 
 	buf->flags = _glibtop_sysdeps_loadavg;
 
-	while (isspace(*p)) p++;
+	p = next_token(p);
 
 	/* Older Linux versions don't have the nr_running/nr_tasks fields. */
 
diff --git a/sysdeps/linux/msg_limits.c b/sysdeps/linux/msg_limits.c
index e2613c25..8f3479ac 100644
--- a/sysdeps/linux/msg_limits.c
+++ b/sysdeps/linux/msg_limits.c
@@ -45,14 +45,12 @@ glibtop_init_msg_limits_s (glibtop *server)
 void
 glibtop_get_msg_limits_s (glibtop *server, glibtop_msg_limits *buf)
 {
-	struct msginfo	msginfo;
+	struct msginfo msginfo;
 
 	glibtop_init_s (&server, GLIBTOP_SYSDEPS_MSG_LIMITS, 0);
 
 	memset (buf, 0, sizeof (glibtop_msg_limits));
 
-	buf->flags = _glibtop_sysdeps_msg_limits;
-
 	msgctl (0, IPC_INFO, (struct msqid_ds *) &msginfo);
 
 	buf->msgpool = msginfo.msgpool;
@@ -62,4 +60,5 @@ glibtop_get_msg_limits_s (glibtop *server, glibtop_msg_limits *buf)
 	buf->msgmni = msginfo.msgmni;
 	buf->msgssz = msginfo.msgssz;
 	buf->msgtql = msginfo.msgtql;
+	buf->flags = _glibtop_sysdeps_msg_limits;
 }
diff --git a/sysdeps/linux/shm_limits.c b/sysdeps/linux/shm_limits.c
index 542fd449..8bd17408 100644
--- a/sysdeps/linux/shm_limits.c
+++ b/sysdeps/linux/shm_limits.c
@@ -50,8 +50,6 @@ glibtop_get_shm_limits_s (glibtop *server, glibtop_shm_limits *buf)
 
 	memset (buf, 0, sizeof (glibtop_shm_limits));
 
-	buf->flags = _glibtop_sysdeps_shm_limits;
-
 	shmctl (0, IPC_INFO, (struct shmid_ds *) &shminfo);
 
 	buf->shmmax = shminfo.shmmax;
@@ -59,4 +57,5 @@ glibtop_get_shm_limits_s (glibtop *server, glibtop_shm_limits *buf)
 	buf->shmmni = shminfo.shmmni;
 	buf->shmseg = shminfo.shmseg;
 	buf->shmall = shminfo.shmall;
+	buf->flags = _glibtop_sysdeps_shm_limits;
 }