diff --git a/configs/pcblogic-pic32mx/README.txt b/configs/pcblogic-pic32mx/README.txt
index d7bfa7d519..ba5ad530cc 100644
--- a/configs/pcblogic-pic32mx/README.txt
+++ b/configs/pcblogic-pic32mx/README.txt
@@ -217,7 +217,7 @@ Loading NuttX with PICkit2
 ==========================
 
   NOTE:  You need a PICKit3 if you plan to use the MPLAB debugger!  The PICKit2
-  can, however, still be used to load problems.  Instructions for the PICKit3
+  can, however, still be used to load programs.  Instructions for the PICKit3
   are similar.
 
   Intel Hex Forma Files:
diff --git a/configs/pic32-starterkit/README.txt b/configs/pic32-starterkit/README.txt
index ea04472796..abacbe556c 100644
--- a/configs/pic32-starterkit/README.txt
+++ b/configs/pic32-starterkit/README.txt
@@ -376,7 +376,7 @@ Loading NuttX with PICkit2
 ==========================
 
   NOTE:  You need a PICKit3 if you plan to use the MPLAB debugger!  The PICKit2
-  can, however, still be used to load problems.  Instructions for the PICKit3
+  can, however, still be used to load programs.  Instructions for the PICKit3
   are similar.
 
   Intel Hex Forma Files:
diff --git a/configs/sim/nsh2/defconfig b/configs/sim/nsh2/defconfig
index 60689afc12..41d5903c7c 100644
--- a/configs/sim/nsh2/defconfig
+++ b/configs/sim/nsh2/defconfig
@@ -182,13 +182,15 @@ CONFIG_PRIORITY_INHERITANCE=n
 CONFIG_SEM_PREALLOCHOLDERS=0
 CONFIG_SEM_NNESTPRIO=0
 CONFIG_FDCLONE_DISABLE=n
+CONFIG_SIG_SIGWORK=4
+CONFIG_FDCLONE_STDIO=n
+CONFIG_SDCLONE_DISABLE=y
 CONFIG_SCHED_WORKQUEUE=n
 CONFIG_SCHED_WORKPRIORITY=50
 CONFIG_SCHED_WORKPERIOD=(50*1000)
 CONFIG_SCHED_WORKSTACKSIZE=1024
-CONFIG_SIG_SIGWORK=4
-CONFIG_FDCLONE_STDIO=n
-CONFIG_SDCLONE_DISABLE=y
+CONFIG_SCHED_WAITPID=y
+CONFIG_SCHED_ATEXIT=n
 
 #
 # The following can be used to disable categories of
diff --git a/configs/sure-pic32mx/README.txt b/configs/sure-pic32mx/README.txt
index 9ff7c39d7b..3d1ab28be1 100644
--- a/configs/sure-pic32mx/README.txt
+++ b/configs/sure-pic32mx/README.txt
@@ -166,7 +166,7 @@ Loading NuttX with PICkit2
 ==========================
 
   NOTE:  You need a PICKit3 if you plan to use the MPLAB debugger!  The PICKit2
-  can, however, still be used to load problems.  Instructions for the PICKit3
+  can, however, still be used to load programs.  Instructions for the PICKit3
   are similar.
 
   Intel Hex Forma Files:
diff --git a/configs/sure-pic32mx/include/board.h b/configs/sure-pic32mx/include/board.h
index 37cb265ebf..dffb8c5190 100644
--- a/configs/sure-pic32mx/include/board.h
+++ b/configs/sure-pic32mx/include/board.h
@@ -104,6 +104,13 @@
 #define LED_PANIC              5  /* N/C N/C N/C   ON    N/C N/C N/C   OFF   */
 #define LED_NVALUES            6
 
+/* For distinguishing individual LEDs */
+
+#define LED_USB                0
+#define LED_SD                 1
+#define LED_FLASH              2
+#define LED_ERROR              3
+
 /* Button Definitions *******************************************************/
 /* The Sure PIC32MX board has three buttons.
  *
diff --git a/configs/sure-pic32mx/src/up_leds.c b/configs/sure-pic32mx/src/up_leds.c
index a277ca0086..d6c9291639 100644
--- a/configs/sure-pic32mx/src/up_leds.c
+++ b/configs/sure-pic32mx/src/up_leds.c
@@ -92,22 +92,17 @@
 #define LED_NC  2
 
 /* Debug ********************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
- */
 
-#undef LED_DEBUG   /* Define to enable debug */
-#undef LED_VERBOSE /* Define to enable verbose debug */
-
-#ifdef LED_DEBUG
+#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_LEDS)
 #  define leddbg  lldbg
-#  ifdef LED_VERBOSE
+#  ifdef CONFIG_DEBUG_VERBOSE
 #    define ledvdbg lldbg
 #  else
 #    define ledvdbg(x...)
 #  endif
 #else
-#  undef LED_VERBOSE
+#  undef CONFIG_DEBUG_LEDS
+#  undef CONFIG_DEBUG_VERBOSE
 #  define leddbg(x...)
 #  define ledvdbg(x...)
 #endif
@@ -153,7 +148,7 @@ static const g_ledoffvalues[LED_NVALUES] =
  ****************************************************************************/
 
 /****************************************************************************
- * Name: up_ledinit
+ * Name: up_setleds
  ****************************************************************************/
 
 void up_setleds(struct led_setting_s *setting)