diff --git a/Makefile b/Makefile
index 1a0cd7e96..79782b817 100644
--- a/Makefile
+++ b/Makefile
@@ -63,7 +63,7 @@ $(foreach BDIR, $(BUILDIRS), $(eval $(call Add_Application,$(BDIR))))
 
 # Library path
 
-LIBPATH ?= $(TOPDIR)$(DELIM)libs
+LIBPATH ?= $(TOPDIR)$(DELIM)staging
 
 # The install path
 
diff --git a/examples/elf/tests/errno/Makefile b/examples/elf/tests/errno/Makefile
index ad00ed751..d2b35447e 100644
--- a/examples/elf/tests/errno/Makefile
+++ b/examples/elf/tests/errno/Makefile
@@ -39,9 +39,9 @@ OBJEXT ?= .o
 DELIM ?= /
 
 ifeq ($(WINTOOL),y)
-NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)lib}"
+NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
 else
-NUTTXLIB = "$(TOPDIR)$(DELIM)lib"
+NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
 endif
 
 ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
diff --git a/examples/elf/tests/hello/Makefile b/examples/elf/tests/hello/Makefile
index a2c52f0bd..ea1e91f3e 100644
--- a/examples/elf/tests/hello/Makefile
+++ b/examples/elf/tests/hello/Makefile
@@ -39,9 +39,9 @@ OBJEXT ?= .o
 DELIM ?= /
 
 ifeq ($(WINTOOL),y)
-NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)lib}"
+NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
 else
-NUTTXLIB = "$(TOPDIR)$(DELIM)lib"
+NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
 endif
 
 ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
diff --git a/examples/elf/tests/helloxx/Makefile b/examples/elf/tests/helloxx/Makefile
index 65ff47b7f..a1b434215 100644
--- a/examples/elf/tests/helloxx/Makefile
+++ b/examples/elf/tests/helloxx/Makefile
@@ -39,9 +39,9 @@ OBJEXT ?= .o
 DELIM ?= /
 
 ifeq ($(WINTOOL),y)
-NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)lib}"
+NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
 else
-NUTTXLIB = "$(TOPDIR)$(DELIM)lib"
+NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
 endif
 
 ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
diff --git a/examples/elf/tests/longjmp/Makefile b/examples/elf/tests/longjmp/Makefile
index dd4fd762c..a5b1f509c 100644
--- a/examples/elf/tests/longjmp/Makefile
+++ b/examples/elf/tests/longjmp/Makefile
@@ -39,9 +39,9 @@ OBJEXT ?= .o
 DELIM ?= /
 
 ifeq ($(WINTOOL),y)
-NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)lib}"
+NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
 else
-NUTTXLIB = "$(TOPDIR)$(DELIM)lib"
+NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
 endif
 
 ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
diff --git a/examples/elf/tests/mutex/Makefile b/examples/elf/tests/mutex/Makefile
index 81b187c28..23d2013e1 100644
--- a/examples/elf/tests/mutex/Makefile
+++ b/examples/elf/tests/mutex/Makefile
@@ -39,9 +39,9 @@ OBJEXT ?= .o
 DELIM ?= /
 
 ifeq ($(WINTOOL),y)
-NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)lib}"
+NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
 else
-NUTTXLIB = "$(TOPDIR)$(DELIM)lib"
+NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
 endif
 
 ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
diff --git a/examples/elf/tests/pthread/Makefile b/examples/elf/tests/pthread/Makefile
index 2b591f906..bef38217b 100644
--- a/examples/elf/tests/pthread/Makefile
+++ b/examples/elf/tests/pthread/Makefile
@@ -39,9 +39,9 @@ OBJEXT ?= .o
 DELIM ?= /
 
 ifeq ($(WINTOOL),y)
-NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)lib}"
+NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
 else
-NUTTXLIB = "$(TOPDIR)$(DELIM)lib"
+NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
 endif
 
 ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
diff --git a/examples/elf/tests/signal/Makefile b/examples/elf/tests/signal/Makefile
index 977a496a4..c770e89bc 100644
--- a/examples/elf/tests/signal/Makefile
+++ b/examples/elf/tests/signal/Makefile
@@ -39,9 +39,9 @@ OBJEXT ?= .o
 DELIM ?= /
 
 ifeq ($(WINTOOL),y)
-NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)lib}"
+NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
 else
-NUTTXLIB = "$(TOPDIR)$(DELIM)lib"
+NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
 endif
 
 ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
diff --git a/examples/elf/tests/struct/Makefile b/examples/elf/tests/struct/Makefile
index ed5d755fe..fa9ec3d50 100644
--- a/examples/elf/tests/struct/Makefile
+++ b/examples/elf/tests/struct/Makefile
@@ -41,9 +41,9 @@ DELIM ?= /
 CELFFLAGS += -I.
 
 ifeq ($(WINTOOL),y)
-NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)lib}"
+NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
 else
-NUTTXLIB = "$(TOPDIR)$(DELIM)lib"
+NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
 endif
 
 ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
diff --git a/examples/elf/tests/task/Makefile b/examples/elf/tests/task/Makefile
index 3c93d5dec..3791ad144 100644
--- a/examples/elf/tests/task/Makefile
+++ b/examples/elf/tests/task/Makefile
@@ -39,9 +39,9 @@ OBJEXT ?= .o
 DELIM ?= /
 
 ifeq ($(WINTOOL),y)
-NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)lib}"
+NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
 else
-NUTTXLIB = "$(TOPDIR)$(DELIM)lib"
+NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
 endif
 
 ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
diff --git a/examples/module/drivers/chardev/Makefile b/examples/module/drivers/chardev/Makefile
index f1a4689b5..89262fa71 100644
--- a/examples/module/drivers/chardev/Makefile
+++ b/examples/module/drivers/chardev/Makefile
@@ -40,9 +40,9 @@ OBJEXT ?= .o
 DELIM ?= /
 
 ifeq ($(WINTOOL),y)
-NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)lib}"
+NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
 else
-NUTTXLIB = "$(TOPDIR)$(DELIM)lib"
+NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
 endif
 
 KDEFINE = ${shell $(TOPDIR)/tools/define.sh "$(CC)" __KERNEL__}
diff --git a/examples/sotest/lib/modprint/Makefile b/examples/sotest/lib/modprint/Makefile
index dd4802580..cf2850ca1 100644
--- a/examples/sotest/lib/modprint/Makefile
+++ b/examples/sotest/lib/modprint/Makefile
@@ -40,9 +40,9 @@ OBJEXT ?= .o
 DELIM ?= /
 
 ifeq ($(WINTOOL),y)
-NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)lib}"
+NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
 else
-NUTTXLIB = "$(TOPDIR)$(DELIM)lib"
+NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
 endif
 
 KDEFINE = ${shell $(TOPDIR)/tools/define.sh "$(CC)" __KERNEL__}
diff --git a/examples/sotest/lib/sotest/Makefile b/examples/sotest/lib/sotest/Makefile
index 3b1ababdf..2be8aad46 100644
--- a/examples/sotest/lib/sotest/Makefile
+++ b/examples/sotest/lib/sotest/Makefile
@@ -40,9 +40,9 @@ OBJEXT ?= .o
 DELIM ?= /
 
 ifeq ($(WINTOOL),y)
-NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)lib}"
+NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
 else
-NUTTXLIB = "$(TOPDIR)$(DELIM)lib"
+NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
 endif
 
 KDEFINE = ${shell $(TOPDIR)/tools/define.sh "$(CC)" __KERNEL__}
diff --git a/import/Make.defs b/import/Make.defs
index e2705f372..1480d4a66 100644
--- a/import/Make.defs
+++ b/import/Make.defs
@@ -186,10 +186,10 @@ AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 ifeq ($(WINTOOL),y)
   # Windows-native toolchains
-  LDLIBPATH = -L "${shell cygpath -w $(APPDIR)}" -L "${shell cygpath -w $(TOPDIR)$(DELIM)libs}"
+  LDLIBPATH = -L "${shell cygpath -w $(APPDIR)}" -L "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
 else
   # Linux/Cygwin-native toolchain
-  LDLIBPATH = -L $(APPDIR) -L $(TOPDIR)$(DELIM)libs
+  LDLIBPATH = -L $(APPDIR) -L $(TOPDIR)$(DELIM)staging
 endif
 
 LDLIBS = -lapps -lnuttx
diff --git a/system/zmodem/zm_proto.c b/system/zmodem/zm_proto.c
index 083af29b9..70e2d0873 100644
--- a/system/zmodem/zm_proto.c
+++ b/system/zmodem/zm_proto.c
@@ -312,6 +312,7 @@ int zm_sendhexhdr(FAR struct zm_state_s *pzm, int type,
     }
 
   /* crc-1 crc-2 */
+  /* REVISIT:  Should this be zm_putzdle()? */
 
   ptr = zm_puthex8(ptr, (crc >> 8) & 0xff);
   ptr = zm_puthex8(ptr, crc & 0xff);