diff --git a/demos/SPC5/NIL-SPC560D-EVB/chconf.h b/demos/SPC5/NIL-SPC560D-EVB/chconf.h
index 3f0c953d7..20ae7b340 100644
--- a/demos/SPC5/NIL-SPC560D-EVB/chconf.h
+++ b/demos/SPC5/NIL-SPC560D-EVB/chconf.h
@@ -48,7 +48,7 @@
  *          (0..CH_CFG_MAX_THREADS-1).
  */
 #if !defined(CH_CFG_MAX_THREADS)
-#define CH_CFG_MAX_THREADS                  4
+#define CH_CFG_MAX_THREADS                  8
 #endif
 
 /**
diff --git a/demos/SPC5/NIL-SPC560D-EVB/main.c b/demos/SPC5/NIL-SPC560D-EVB/main.c
index db2cc7a7f..52c4a304b 100644
--- a/demos/SPC5/NIL-SPC560D-EVB/main.c
+++ b/demos/SPC5/NIL-SPC560D-EVB/main.c
@@ -123,7 +123,7 @@ THD_FUNCTION(Thread2, arg) {
  */
 THD_TABLE_BEGIN
   THD_TABLE_THREAD(0, "blinker",      waThread1,       Thread1,      NULL)
-  THD_TABLE_THREAD(2, "tester",       waThread2,       Thread2,      NULL)
+  THD_TABLE_THREAD(4, "tester",       waThread2,       Thread2,      NULL)
 THD_TABLE_END
 
 /*
diff --git a/demos/STM32/NIL-STM32F051-DISCOVERY/cfg/chconf.h b/demos/STM32/NIL-STM32F051-DISCOVERY/cfg/chconf.h
index e0b702ec0..d65e7a7c1 100644
--- a/demos/STM32/NIL-STM32F051-DISCOVERY/cfg/chconf.h
+++ b/demos/STM32/NIL-STM32F051-DISCOVERY/cfg/chconf.h
@@ -48,7 +48,7 @@
  *          (0..CH_CFG_MAX_THREADS-1).
  */
 #if !defined(CH_CFG_MAX_THREADS)
-#define CH_CFG_MAX_THREADS                  5
+#define CH_CFG_MAX_THREADS                  8
 #endif
 
 /**
diff --git a/demos/STM32/NIL-STM32F051-DISCOVERY/main.c b/demos/STM32/NIL-STM32F051-DISCOVERY/main.c
index 4b6766a4a..94d106fc2 100644
--- a/demos/STM32/NIL-STM32F051-DISCOVERY/main.c
+++ b/demos/STM32/NIL-STM32F051-DISCOVERY/main.c
@@ -86,7 +86,7 @@ THD_FUNCTION(Thread3, arg) {
 THD_TABLE_BEGIN
   THD_TABLE_THREAD(0, "blinker1",     waThread1,       Thread1,      NULL)
   THD_TABLE_THREAD(1, "blinker2",     waThread2,       Thread2,      NULL)
-  THD_TABLE_THREAD(3, "tester",       waThread3,       Thread3,      NULL)
+  THD_TABLE_THREAD(4, "tester",       waThread3,       Thread3,      NULL)
 THD_TABLE_END
 
 /*
diff --git a/demos/STM32/NIL-STM32F303-DISCOVERY/cfg/chconf.h b/demos/STM32/NIL-STM32F303-DISCOVERY/cfg/chconf.h
index d0d25e34b..cb097ebfe 100644
--- a/demos/STM32/NIL-STM32F303-DISCOVERY/cfg/chconf.h
+++ b/demos/STM32/NIL-STM32F303-DISCOVERY/cfg/chconf.h
@@ -48,7 +48,7 @@
  *          (0..CH_CFG_MAX_THREADS-1).
  */
 #if !defined(CH_CFG_MAX_THREADS)
-#define CH_CFG_MAX_THREADS                  5
+#define CH_CFG_MAX_THREADS                  8
 #endif
 
 /**
diff --git a/demos/STM32/NIL-STM32F303-DISCOVERY/main.c b/demos/STM32/NIL-STM32F303-DISCOVERY/main.c
index 249daaea5..9e680bbc3 100644
--- a/demos/STM32/NIL-STM32F303-DISCOVERY/main.c
+++ b/demos/STM32/NIL-STM32F303-DISCOVERY/main.c
@@ -110,7 +110,7 @@ THD_FUNCTION(Thread3, arg) {
 THD_TABLE_BEGIN
   THD_TABLE_THREAD(0, "blinker1",     waThread1,       Thread1,      NULL)
   THD_TABLE_THREAD(1, "blinker2",     waThread2,       Thread2,      NULL)
-  THD_TABLE_THREAD(3, "tester",       waThread3,       Thread3,      NULL)
+  THD_TABLE_THREAD(4, "tester",       waThread3,       Thread3,      NULL)
 THD_TABLE_END
 
 /*
diff --git a/demos/STM32/NIL-STM32F746G-DISCOVERY/cfg/chconf.h b/demos/STM32/NIL-STM32F746G-DISCOVERY/cfg/chconf.h
index 245bdea14..16342a9ef 100644
--- a/demos/STM32/NIL-STM32F746G-DISCOVERY/cfg/chconf.h
+++ b/demos/STM32/NIL-STM32F746G-DISCOVERY/cfg/chconf.h
@@ -48,7 +48,7 @@
  *          (0..CH_CFG_MAX_THREADS-1).
  */
 #if !defined(CH_CFG_MAX_THREADS)
-#define CH_CFG_MAX_THREADS                  4
+#define CH_CFG_MAX_THREADS                  8
 #endif
 
 /**
@@ -379,7 +379,7 @@
  * @note    The default is @p FALSE.
  */
 #if !defined(CH_DBG_SYSTEM_STATE_CHECK)
-#define CH_DBG_SYSTEM_STATE_CHECK           TRUE
+#define CH_DBG_SYSTEM_STATE_CHECK           FALSE
 #endif
 
 /**
@@ -388,7 +388,7 @@
  * @note    The default is @p FALSE.
  */
 #if !defined(CH_DBG_ENABLE_CHECKS)
-#define CH_DBG_ENABLE_CHECKS                TRUE
+#define CH_DBG_ENABLE_CHECKS                FALSE
 #endif
 
 /**
@@ -397,7 +397,7 @@
  * @note    The default is @p FALSE.
  */
 #if !defined(CH_DBG_ENABLE_ASSERTS)
-#define CH_DBG_ENABLE_ASSERTS               TRUE
+#define CH_DBG_ENABLE_ASSERTS               FALSE
 #endif
 
 /**
@@ -406,7 +406,7 @@
  * @note    The default is @p FALSE.
  */
 #if !defined(CH_DBG_ENABLE_STACK_CHECK)
-#define CH_DBG_ENABLE_STACK_CHECK           TRUE
+#define CH_DBG_ENABLE_STACK_CHECK           FALSE
 #endif
 
 /** @} */
diff --git a/demos/STM32/NIL-STM32F746G-DISCOVERY/main.c b/demos/STM32/NIL-STM32F746G-DISCOVERY/main.c
index 58255f259..418c939aa 100644
--- a/demos/STM32/NIL-STM32F746G-DISCOVERY/main.c
+++ b/demos/STM32/NIL-STM32F746G-DISCOVERY/main.c
@@ -72,7 +72,7 @@ THD_FUNCTION(Thread2, arg) {
  */
 THD_TABLE_BEGIN
   THD_TABLE_THREAD(0, "blinker1",     waThread1,       Thread1,      NULL)
-  THD_TABLE_THREAD(2, "tester",       waThread2,       Thread2,      NULL)
+  THD_TABLE_THREAD(4, "tester",       waThread2,       Thread2,      NULL)
 THD_TABLE_END
 
 /*
diff --git a/demos/STM32/NIL-STM32L476-DISCOVERY/cfg/chconf.h b/demos/STM32/NIL-STM32L476-DISCOVERY/cfg/chconf.h
index d0d25e34b..cb097ebfe 100644
--- a/demos/STM32/NIL-STM32L476-DISCOVERY/cfg/chconf.h
+++ b/demos/STM32/NIL-STM32L476-DISCOVERY/cfg/chconf.h
@@ -48,7 +48,7 @@
  *          (0..CH_CFG_MAX_THREADS-1).
  */
 #if !defined(CH_CFG_MAX_THREADS)
-#define CH_CFG_MAX_THREADS                  5
+#define CH_CFG_MAX_THREADS                  8
 #endif
 
 /**
diff --git a/demos/STM32/NIL-STM32L476-DISCOVERY/main.c b/demos/STM32/NIL-STM32L476-DISCOVERY/main.c
index 4a53c1d1d..99551f148 100644
--- a/demos/STM32/NIL-STM32L476-DISCOVERY/main.c
+++ b/demos/STM32/NIL-STM32L476-DISCOVERY/main.c
@@ -83,7 +83,7 @@ THD_FUNCTION(Thread3, arg) {
 THD_TABLE_BEGIN
   THD_TABLE_THREAD(0, "blinker1",     waThread1,       Thread1,      NULL)
   THD_TABLE_THREAD(1, "blinker2",     waThread2,       Thread2,      NULL)
-  THD_TABLE_THREAD(3, "tester",       waThread3,       Thread3,      NULL)
+  THD_TABLE_THREAD(4, "tester",       waThread3,       Thread3,      NULL)
 THD_TABLE_END
 
 /*
diff --git a/os/nil/src/ch.c b/os/nil/src/ch.c
index 47edce802..35ebbac03 100644
--- a/os/nil/src/ch.c
+++ b/os/nil/src/ch.c
@@ -775,7 +775,7 @@ thread_t *chThdCreateI(const thread_descriptor_t *tdp) {
   tp->epmask = (eventmask_t)0;
 #endif
 #if CH_DBG_ENABLE_STACK_CHECK == TRUE
-  tp->wabase = (stkalign_t *)tcp->wbase;
+  tp->wabase = (stkalign_t *)tdp->wbase;
 #endif
 
   /* Port dependent thread initialization.*/
diff --git a/test/oslib/configuration.xml b/test/oslib/configuration.xml
index a467f47df..6a117ae67 100644
--- a/test/oslib/configuration.xml
+++ b/test/oslib/configuration.xml
@@ -1120,7 +1120,7 @@ thread_descriptor_t td2 = {
   .name  = "dispatcher2",
   .wbase = wa2Thread1,
   .wend  = THD_WORKING_AREA_END(wa2Thread1),
-  .prio  = chThdGetPriorityX() - 1,
+  .prio  = chThdGetPriorityX() - 2,
   .funcp = Thread1,
   .arg   = NULL
 };
diff --git a/test/oslib/source/test/oslib_test_sequence_004.c b/test/oslib/source/test/oslib_test_sequence_004.c
index 525f9aae1..f9fe573ad 100644
--- a/test/oslib/source/test/oslib_test_sequence_004.c
+++ b/test/oslib/source/test/oslib_test_sequence_004.c
@@ -84,7 +84,7 @@ static THD_FUNCTION(Thread1, arg) {
  * - [4.1.1] Initializing the Jobs Queue object.
  * - [4.1.2] Starting the dispatcher threads.
  * - [4.1.3] Sending jobs with various timings.
- * - [4.1.4] Sending null jobs to make threads exit.
+ * - [4.1.4] Sending two null jobs to make threads exit.
  * .
  */
 
@@ -115,7 +115,7 @@ static void oslib_test_004_001_execute(void) {
       .name  = "dispatcher2",
       .wbase = wa2Thread1,
       .wend  = THD_WORKING_AREA_END(wa2Thread1),
-      .prio  = chThdGetPriorityX() - 1,
+      .prio  = chThdGetPriorityX() - 2,
       .funcp = Thread1,
       .arg   = NULL
     };
@@ -138,7 +138,7 @@ static void oslib_test_004_001_execute(void) {
   }
   test_end_step(3);
 
-  /* [4.1.4] Sending null jobs to make threads exit.*/
+  /* [4.1.4] Sending two null jobs to make threads exit.*/
   test_set_step(4);
   {
     job_descriptor_t *jdp;