diff --git a/arch/arm/src/efm32/efm32_start.c b/arch/arm/src/efm32/efm32_start.c
index b18cd24389e..b24b0a34580 100644
--- a/arch/arm/src/efm32/efm32_start.c
+++ b/arch/arm/src/efm32/efm32_start.c
@@ -221,7 +221,7 @@ static inline void efm32_fpuconfig(void)
  * Name: go_os_start
  *
  * Description:
- *   Set the IDLE stack to the
+ *   Set the IDLE stack to the coloration value and jump into os_start()
  *
  ****************************************************************************/
 
@@ -238,6 +238,7 @@ static void go_os_start(void *pv, unsigned int nbytes)
   __asm__ __volatile__
   (
     "\tmovs r1, r1, lsr #2\n"   /* R1 = nwords = nbytes >> 2 */
+    "\tcmp  r1, #0\n"           /* Check (nwords == 0) */
     "\tbeq  2f\n"               /* (should not happen) */
 
     "\tbic  r0, r0, #3\n"       /* R0 = Aligned stackptr */
diff --git a/arch/arm/src/imxrt/imxrt_start.c b/arch/arm/src/imxrt/imxrt_start.c
index ef35e27bd36..c9f9b3a3270 100644
--- a/arch/arm/src/imxrt/imxrt_start.c
+++ b/arch/arm/src/imxrt/imxrt_start.c
@@ -248,7 +248,7 @@ static inline void imxrt_tcmenable(void)
  * Name: go_os_start
  *
  * Description:
- *   Set the IDLE stack to the
+ *   Set the IDLE stack to the coloration value and jump into os_start()
  *
  ****************************************************************************/
 
@@ -265,6 +265,7 @@ static void go_os_start(void *pv, unsigned int nbytes)
   __asm__ __volatile__
   (
     "\tmovs r1, r1, lsr #2\n"   /* R1 = nwords = nbytes >> 2 */
+    "\tcmp  r1, #0\n"           /* Check (nwords == 0) */
     "\tbeq  2f\n"               /* (should not happen) */
 
     "\tbic  r0, r0, #3\n"       /* R0 = Aligned stackptr */
diff --git a/arch/arm/src/kinetis/kinetis_start.c b/arch/arm/src/kinetis/kinetis_start.c
index 3b891928a76..bcefd3ead94 100644
--- a/arch/arm/src/kinetis/kinetis_start.c
+++ b/arch/arm/src/kinetis/kinetis_start.c
@@ -114,14 +114,6 @@ static void go_os_start(void *pv, unsigned int nbytes)
 
 const uintptr_t g_idle_topstack = HEAP_BASE;
 
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
@@ -227,7 +219,7 @@ static inline void kinetis_fpuconfig(void)
  * Name: go_os_start
  *
  * Description:
- *   Set the IDLE stack to the
+ *   Set the IDLE stack to the coloration value and jump into os_start()
  *
  ****************************************************************************/
 
@@ -245,6 +237,7 @@ static void go_os_start(void *pv, unsigned int nbytes)
   __asm__ __volatile__
   (
     "\tmovs r1, r1, lsr #2\n"   /* R1 = nwords = nbytes >> 2 */
+    "\tcmp  r1, #0\n"           /* Check (nwords == 0) */
     "\tbeq  2f\n"               /* (should not happen) */
 
     "\tbic  r0, r0, #3\n"       /* R0 = Aligned stackptr */
diff --git a/arch/arm/src/sam34/sam_start.c b/arch/arm/src/sam34/sam_start.c
index 4f63b18c5d2..654ecac1f7f 100644
--- a/arch/arm/src/sam34/sam_start.c
+++ b/arch/arm/src/sam34/sam_start.c
@@ -220,7 +220,7 @@ static inline void sam_fpuconfig(void)
  * Name: go_os_start
  *
  * Description:
- *   Set the IDLE stack to the
+ *   Set the IDLE stack to the coloration value and jump into os_start()
  *
  ****************************************************************************/
 
@@ -237,6 +237,7 @@ static void go_os_start(void *pv, unsigned int nbytes)
   __asm__ __volatile__
   (
     "\tmovs r1, r1, lsr #2\n"   /* R1 = nwords = nbytes >> 2 */
+    "\tcmp  r1, #0\n"           /* Check (nwords == 0) */
     "\tbeq  2f\n"               /* (should not happen) */
 
     "\tbic  r0, r0, #3\n"       /* R0 = Aligned stackptr */
diff --git a/arch/arm/src/samd5e5/sam_start.c b/arch/arm/src/samd5e5/sam_start.c
index 6fd5ba5d8ba..f4e7600698d 100644
--- a/arch/arm/src/samd5e5/sam_start.c
+++ b/arch/arm/src/samd5e5/sam_start.c
@@ -221,7 +221,7 @@ static inline void sam_fpu_configure(void)
  * Name: go_os_start
  *
  * Description:
- *   Set the IDLE stack to the
+ *   Set the IDLE stack to the coloration value and jump into os_start()
  *
  ****************************************************************************/
 
@@ -238,6 +238,7 @@ static void go_os_start(void *pv, unsigned int nbytes)
   __asm__ __volatile__
   (
     "\tmovs r1, r1, lsr #2\n"   /* R1 = nwords = nbytes >> 2 */
+    "\tcmp  r1, #0\n"           /* Check (nwords == 0) */
     "\tbeq  2f\n"               /* (should not happen) */
 
     "\tbic  r0, r0, #3\n"       /* R0 = Aligned stackptr */
diff --git a/arch/arm/src/samv7/sam_start.c b/arch/arm/src/samv7/sam_start.c
index ad4522b8028..165c08b8279 100644
--- a/arch/arm/src/samv7/sam_start.c
+++ b/arch/arm/src/samv7/sam_start.c
@@ -261,7 +261,7 @@ static inline void sam_tcmenable(void)
  * Name: go_os_start
  *
  * Description:
- *   Set the IDLE stack to the
+ *   Set the IDLE stack to the coloration value and jump into os_start()
  *
  ****************************************************************************/
 
@@ -278,6 +278,7 @@ static void go_os_start(void *pv, unsigned int nbytes)
   __asm__ __volatile__
   (
     "\tmovs r1, r1, lsr #2\n"   /* R1 = nwords = nbytes >> 2 */
+    "\tcmp  r1, #0\n"           /* Check (nwords == 0) */
     "\tbeq  2f\n"               /* (should not happen) */
 
     "\tbic  r0, r0, #3\n"       /* R0 = Aligned stackptr */
diff --git a/arch/arm/src/stm32/stm32_start.c b/arch/arm/src/stm32/stm32_start.c
index d8483ef1634..b38a4ac3a0b 100644
--- a/arch/arm/src/stm32/stm32_start.c
+++ b/arch/arm/src/stm32/stm32_start.c
@@ -222,7 +222,7 @@ static inline void stm32_fpuconfig(void)
  * Name: go_os_start
  *
  * Description:
- *   Set the IDLE stack to the
+ *   Set the IDLE stack to the coloration value and jump into os_start()
  *
  ****************************************************************************/
 
@@ -239,6 +239,7 @@ static void go_os_start(void *pv, unsigned int nbytes)
   __asm__ __volatile__
   (
     "\tmovs r1, r1, lsr #2\n"   /* R1 = nwords = nbytes >> 2 */
+    "\tcmp  r1, #0\n"           /* Check (nwords == 0) */
     "\tbeq  2f\n"               /* (should not happen) */
 
     "\tbic  r0, r0, #3\n"       /* R0 = Aligned stackptr */
diff --git a/arch/arm/src/stm32f7/stm32_start.c b/arch/arm/src/stm32f7/stm32_start.c
index 8784369d02f..a84251c7af5 100644
--- a/arch/arm/src/stm32f7/stm32_start.c
+++ b/arch/arm/src/stm32f7/stm32_start.c
@@ -262,7 +262,7 @@ static inline void stm32_tcmenable(void)
  * Name: go_os_start
  *
  * Description:
- *   Set the IDLE stack to the
+ *   Set the IDLE stack to the coloration value and jump into os_start()
  *
  ****************************************************************************/
 
@@ -279,6 +279,7 @@ static void go_os_start(void *pv, unsigned int nbytes)
   __asm__ __volatile__
   (
     "\tmovs r1, r1, lsr #2\n"   /* R1 = nwords = nbytes >> 2 */
+    "\tcmp  r1, #0\n"           /* Check (nwords == 0) */
     "\tbeq  2f\n"               /* (should not happen) */
 
     "\tbic  r0, r0, #3\n"       /* R0 = Aligned stackptr */
diff --git a/arch/arm/src/stm32h7/stm32_start.c b/arch/arm/src/stm32h7/stm32_start.c
index e26470da175..7c0341b2794 100644
--- a/arch/arm/src/stm32h7/stm32_start.c
+++ b/arch/arm/src/stm32h7/stm32_start.c
@@ -277,7 +277,7 @@ static inline void stm32_tcmenable(void)
  * Name: go_os_start
  *
  * Description:
- *   Set the IDLE stack to the
+ *   Set the IDLE stack to the coloration value and jump into os_start()
  *
  ****************************************************************************/
 
@@ -294,6 +294,7 @@ static void go_os_start(void *pv, unsigned int nbytes)
   __asm__ __volatile__
   (
     "\tmovs r1, r1, lsr #2\n"   /* R1 = nwords = nbytes >> 2 */
+    "\tcmp  r1, #0\n"           /* Check (nwords == 0) */
     "\tbeq  2f\n"               /* (should not happen) */
 
     "\tbic  r0, r0, #3\n"       /* R0 = Aligned stackptr */
diff --git a/arch/arm/src/stm32l4/stm32l4_start.c b/arch/arm/src/stm32l4/stm32l4_start.c
index 38b31f68996..d89a41de455 100644
--- a/arch/arm/src/stm32l4/stm32l4_start.c
+++ b/arch/arm/src/stm32l4/stm32l4_start.c
@@ -230,7 +230,7 @@ static inline void stm32l4_fpuconfig(void)
  * Name: go_os_start
  *
  * Description:
- *   Set the IDLE stack to the
+ *   Set the IDLE stack to the coloration value and jump into os_start()
  *
  ****************************************************************************/
 
@@ -247,6 +247,7 @@ static void go_os_start(void *pv, unsigned int nbytes)
   __asm__ __volatile__
   (
     "\tmovs r1, r1, lsr #2\n"   /* R1 = nwords = nbytes >> 2 */
+    "\tcmp  r1, #0\n"           /* Check (nwords == 0) */
     "\tbeq  2f\n"               /* (should not happen) */
 
     "\tbic  r0, r0, #3\n"       /* R0 = Aligned stackptr */
diff --git a/arch/arm/src/tiva/hardware/cc13x0/cc13x0_vims.h b/arch/arm/src/tiva/hardware/cc13x0/cc13x0_vims.h
index 5a8aa13e1e5..518809a7f60 100644
--- a/arch/arm/src/tiva/hardware/cc13x0/cc13x0_vims.h
+++ b/arch/arm/src/tiva/hardware/cc13x0/cc13x0_vims.h
@@ -55,7 +55,7 @@
 /* VIMS Register Offsets ********************************************************************************************/
 
 #define TIVA_VIMS_STAT_OFFSET           0x0000  /* Status */
-#define TIVA_VIMS_CTL_OFFSET            0x0004  /* Status */
+#define TIVA_VIMS_CTL_OFFSET            0x0004  /* Control */
 
 /* VIMS Register Addresses ******************************************************************************************/
 
diff --git a/arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_vims.h b/arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_vims.h
index 07bbd403e06..e236c30edb3 100644
--- a/arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_vims.h
+++ b/arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_vims.h
@@ -55,7 +55,7 @@
 /* VIMS Register Offsets ********************************************************************************************/
 
 #define TIVA_VIMS_STAT_OFFSET           0x0000  /* Status */
-#define TIVA_VIMS_CTL_OFFSET            0x0004  /* Status */
+#define TIVA_VIMS_CTL_OFFSET            0x0004  /* Control */
 
 /* VIMS Register Addresses ******************************************************************************************/
 
diff --git a/arch/arm/src/xmc4/xmc4_start.c b/arch/arm/src/xmc4/xmc4_start.c
index caae9a5acea..1d8d7b42a59 100644
--- a/arch/arm/src/xmc4/xmc4_start.c
+++ b/arch/arm/src/xmc4/xmc4_start.c
@@ -259,7 +259,7 @@ static inline void xmc4_flash_waitstates(void)
  * Name: go_os_start
  *
  * Description:
- *   Set the IDLE stack to the
+ *   Set the IDLE stack to the coloration value and jump into os_start()
  *
  ****************************************************************************/
 
@@ -276,6 +276,7 @@ static void go_os_start(void *pv, unsigned int nbytes)
   __asm__ __volatile__
   (
     "\tmovs r1, r1, lsr #2\n"   /* R1 = nwords = nbytes >> 2 */
+    "\tcmp  r1, #0\n"           /* Check (nwords == 0) */
     "\tbeq  2f\n"               /* (should not happen) */
 
     "\tbic  r0, r0, #3\n"       /* R0 = Aligned stackptr */