diff --git a/demos/ARM7-AT91SAM7S-GCC/main.c b/demos/ARM7-AT91SAM7S-GCC/main.c
index 4077ffb58..82e1ee5f2 100644
--- a/demos/ARM7-AT91SAM7S-GCC/main.c
+++ b/demos/ARM7-AT91SAM7S-GCC/main.c
@@ -21,7 +21,7 @@
 #include "hal.h"
 #include "test.h"
 
-static WORKING_AREA(waThread1, 64);
+static WORKING_AREA(waThread1, 128);
 static msg_t Thread1(void *p) {
 
   (void)p;
diff --git a/demos/ARM7-AT91SAM7X-FATFS-GCC/main.c b/demos/ARM7-AT91SAM7X-FATFS-GCC/main.c
index 3e02fff74..3ed2ab0e6 100644
--- a/demos/ARM7-AT91SAM7X-FATFS-GCC/main.c
+++ b/demos/ARM7-AT91SAM7X-FATFS-GCC/main.c
@@ -230,7 +230,7 @@ static const ShellConfig shell_cfg1 = {
 /*
  * LCD blinker thread, times are in milliseconds.
  */
-static WORKING_AREA(waThread1, 64);
+static WORKING_AREA(waThread1, 128);
 static msg_t Thread1(void *p) {
 
   (void)p;
diff --git a/demos/ARM7-AT91SAM7X-GCC/main.c b/demos/ARM7-AT91SAM7X-GCC/main.c
index a560bc439..f5514b41a 100644
--- a/demos/ARM7-AT91SAM7X-GCC/main.c
+++ b/demos/ARM7-AT91SAM7X-GCC/main.c
@@ -21,7 +21,7 @@
 #include "hal.h"
 #include "test.h"
 
-static WORKING_AREA(waThread1, 64);
+static WORKING_AREA(waThread1, 128);
 static msg_t Thread1(void *p) {
 
   (void)p;
diff --git a/demos/ARM7-AT91SAM7X-LWIP-GCC/main.c b/demos/ARM7-AT91SAM7X-LWIP-GCC/main.c
index 907f0d8ee..895766132 100644
--- a/demos/ARM7-AT91SAM7X-LWIP-GCC/main.c
+++ b/demos/ARM7-AT91SAM7X-LWIP-GCC/main.c
@@ -24,7 +24,7 @@
 #include "lwip/lwipthread.h"
 #include "web/web.h"
 
-static WORKING_AREA(waThread1, 64);
+static WORKING_AREA(waThread1, 128);
 static msg_t Thread1(void *p) {
 
   (void)p;
diff --git a/demos/ARM7-AT91SAM7X-UIP-GCC/main.c b/demos/ARM7-AT91SAM7X-UIP-GCC/main.c
index 5db4864b9..3a3f5eeb6 100644
--- a/demos/ARM7-AT91SAM7X-UIP-GCC/main.c
+++ b/demos/ARM7-AT91SAM7X-UIP-GCC/main.c
@@ -24,11 +24,11 @@
 #include "web/webthread.h"
 
 static WORKING_AREA(waWebThread, 1024);
+
 static WORKING_AREA(waThread1, 128);
+static msg_t Thread1(void *p) {
 
-static msg_t Thread1(void *arg) {
-
-  (void)arg;
+  (void)p;
   while (TRUE) {
     palSetPad(IOPORT2, PIOB_LCD_BL);
     chThdSleepMilliseconds(100);