diff --git a/apps/nshlib/nsh_consolemain.c b/apps/nshlib/nsh_consolemain.c
index baf2e74b4d..6b51be4705 100644
--- a/apps/nshlib/nsh_consolemain.c
+++ b/apps/nshlib/nsh_consolemain.c
@@ -97,9 +97,10 @@
 int nsh_consolemain(int argc, char *argv[])
 {
   FAR struct console_stdio_s *pstate = nsh_newconsole();
-  DEBUGASSERT(pstate);
   int ret;
 
+  DEBUGASSERT(pstate);
+
   /* If we are using a USB serial console, then we will have to wait for the
    * USB to be connected to the host.
    */
diff --git a/apps/nshlib/nsh_mntcmds.c b/apps/nshlib/nsh_mntcmds.c
index 027046c77c..690d027cae 100644
--- a/apps/nshlib/nsh_mntcmds.c
+++ b/apps/nshlib/nsh_mntcmds.c
@@ -199,6 +199,7 @@ int cmd_mount(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
   FAR char *target;
   FAR char *filesystem = NULL;
   bool badarg = false;
+  int option;
   int ret;
 
   /* The mount command behaves differently if no parameters are provided */
@@ -214,7 +215,6 @@ int cmd_mount(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
    * logic just sets 'badarg' and continues.
    */
 
-  int option;
   while ((option = getopt(argc, argv, ":t:")) != ERROR)
     {
       switch (option)
diff --git a/nuttx/configs/ez80f910200zco/README.txt b/nuttx/configs/ez80f910200zco/README.txt
index 1b28177046..51b219493c 100644
--- a/nuttx/configs/ez80f910200zco/README.txt
+++ b/nuttx/configs/ez80f910200zco/README.txt
@@ -49,6 +49,7 @@ Version 5.1.1
   Windows 7 system.
   
 Other Versions
+
   If you use any version of ZDS-II other than 4.11.0 or if you install ZDS-II
   at any location other than the default location, you will have to modify
   two files:  (1) configs/ez80f910200zco/*/setenv.sh and (2)
diff --git a/nuttx/include/nuttx/vt100.h b/nuttx/include/nuttx/vt100.h
index a0254e88a6..d834f48f0c 100644
--- a/nuttx/include/nuttx/vt100.h
+++ b/nuttx/include/nuttx/vt100.h
@@ -105,7 +105,7 @@
 #define VT100_CURSORPOS(v,h) {ASCII_ESC, '[', (v), ';', (h), 'H'} /* Move cursor to screen location v,h */
 
 #define VT100_HVHOME         {ASCII_ESC, '[', 'f'}            /* Move cursor to upper left corner */
-#define VT100_HVHOME_        {ASCII_ESC, '[', ;', 'f'}        /* Move cursor to upper left corner */
+#define VT100_HVHOME_        {ASCII_ESC, '[', ';', 'f'}       /* Move cursor to upper left corner */
 #define VT100_HVPOS(v,h)     {ASCII_ESC, '[', (v), ';', (h), 'f'} /* Move cursor to screen location v,h */
 #define VT100_INDEX          {ASCII_ESC, 'D'}                 /* Move/scroll window up one line */
 #define VT100_REVINDEX       {ASCII_ESC, 'M'}                 /* Move/scroll window down one line */
@@ -138,7 +138,7 @@
 #define VT100_TERMNOK        {ASCII_ESC, '3', 'n'}            /* Response: terminal is not OK */
 
 #define VT100_GETCURSOR      {ASCII_ESC, '6', 'n'}            /* Get cursor position */
-#define VT100_CURSORPOS      {ASCII_ESC, (v), ';', (h), 'R'}  /* Response: cursor is at v,h */
+#define VT100_CURSORPOSAT    {ASCII_ESC, (v), ';', (h), 'R'}  /* Response: cursor is at v,h */
 
 #define VT100_IDENT          {ASCII_ESC, '[', 'c'}            /* Identify what terminal type */
 #define VT100_IDENT_         {ASCII_ESC, '[', '0', 'c'}       /* Identify what terminal type */
diff --git a/nuttx/lib/stdio/lib_fopen.c b/nuttx/lib/stdio/lib_fopen.c
index 52e44c59de..29ff4569c2 100644
--- a/nuttx/lib/stdio/lib_fopen.c
+++ b/nuttx/lib/stdio/lib_fopen.c
@@ -64,7 +64,7 @@ enum open_mode_e
   MODE_A,        /* "a" or "ab" open for writing, appending to file */
   MODE_RPLUS,    /* "r+", "rb+", or "r+b" open for update (reading and writing) */
   MODE_WPLUS,    /* "w+", "wb+", or "w+b"  open for update, truncating or creating file */
-  MODE_APLUS,    /* "a+", "ab+", or "a+b" open for update, appending to file */
+  MODE_APLUS     /* "a+", "ab+", or "a+b" open for update, appending to file */
 };
 
 /****************************************************************************
diff --git a/nuttx/sched/task_exithook.c b/nuttx/sched/task_exithook.c
index 63dc28aa05..8497af7ee9 100644
--- a/nuttx/sched/task_exithook.c
+++ b/nuttx/sched/task_exithook.c
@@ -44,6 +44,7 @@
 #include <debug.h>
 #include <errno.h>
 
+#include <nuttx/sched.h>
 #include <nuttx/fs/fs.h>
 
 #include "os_internal.h"