diff --git a/ChangeLog.txt b/ChangeLog.txt
index 06709996f..f4aedd828 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -172,3 +172,14 @@
   NxWidgets/NxWM unit tests.
 
 1.4 2012-xx-xx Gregory Nutt <gnutt@nuttx.org>
+
+* libnxwidgets/Makefile, NxWidgets/nxwm/Makefile, and
+  NxWidgets/UnitTests/nxwm/Makefile:  Makefile improvements from
+  submitted by Petteri Aimonen.  Other Makefiles in the UnitTests
+  directory probably also need these changes.
+* libnxwidgets/src/ccallback.cxx: Fix misplaced #endif.  Provided
+  by Petteri Aimonen.
+* libnxwidgets/src/cnxserver.cxx:  Reduce delay to allow NX server
+  to start.  One second was un-necessarily long.  Reduced to 50 MS.
+  Reduction suggested by Petteri Aimonen.
+
diff --git a/UnitTests/nxwm/Makefile b/UnitTests/nxwm/Makefile
index 11c670ece..f84a78bcc 100644
--- a/UnitTests/nxwm/Makefile
+++ b/UnitTests/nxwm/Makefile
@@ -105,7 +105,7 @@ STACKSIZE	= 2048
 
 VPATH		= 
 
-all: .built
+all: chkcxx chklibnxwidgets chklibnxwm .built
 .PHONY:	clean depend context disclean chkcxx chklibnxwidgets chklibnxwm
 
 # Object file creation targets
@@ -163,7 +163,7 @@ $(NXWIDGETS_LIB): # Just to keep make happy.  chklibnxwidgets does the work.
 
 $(NXWM_LIB): # Just to keep make happy.  chklibnxwm does the work.
 
-.built: chkcxx chklibnxwidgets chklibnxwm $(OBJS) $(NXWIDGETS_LIB)
+.built: $(OBJS) $(NXWIDGETS_LIB)
 	@( for obj in $(OBJS) ; do \
 		$(call ARCHIVE, $(BIN), $${obj}); \
 	   done ; )
diff --git a/libnxwidgets/Makefile b/libnxwidgets/Makefile
index 0afb55e69..92eb87751 100644
--- a/libnxwidgets/Makefile
+++ b/libnxwidgets/Makefile
@@ -92,7 +92,7 @@ CXXFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(NXWIDGETDIR
 DEPPATH = --dep-path src
 VPATH = src
 
-all: $(BIN)
+all: check_nuttx $(BIN)
 .PHONY = check_nuttx depend clean distclean export
 
 $(AOBJS): %$(OBJEXT): %.S
@@ -122,7 +122,7 @@ check_nuttx:
 		fi; \
 	)
 
-$(BIN): check_nuttx $(OBJS)
+$(BIN): $(OBJS)
 	@( for obj in $(OBJS) ; do \
 		$(call ARCHIVE, $@, $${obj}); \
 	done ; )
diff --git a/libnxwidgets/src/ccallback.cxx b/libnxwidgets/src/ccallback.cxx
index 374502a38..269a5cdb1 100644
--- a/libnxwidgets/src/ccallback.cxx
+++ b/libnxwidgets/src/ccallback.cxx
@@ -226,6 +226,8 @@ void CCallback::newKeyboardEvent(NXHANDLE hwnd, uint8_t nCh,
     }
 }
 
+#endif // CONFIG_NX_KBD
+
 /**
  * This callback is the response from nx_block (or nxtk_block). Those
  * blocking interfaces are used to assure that no further messages are
@@ -260,4 +262,3 @@ void CCallback::windowBlocked(NXWINDOW hwnd, FAR void *arg1, FAR void *arg2)
 }
 #endif
 
-#endif // CONFIG_NX_KBD
diff --git a/libnxwidgets/src/cnxserver.cxx b/libnxwidgets/src/cnxserver.cxx
index 8816c73bc..4d5a6e681 100644
--- a/libnxwidgets/src/cnxserver.cxx
+++ b/libnxwidgets/src/cnxserver.cxx
@@ -225,7 +225,7 @@ bool CNxServer::connect(void)
 
   // Wait a bit to let the server get started
 
-  sleep(1);
+  usleep(50*1000);
 
   // Connect to the server
 
diff --git a/nxwm/Makefile b/nxwm/Makefile
index 6b60327af..f26ae03bb 100644
--- a/nxwm/Makefile
+++ b/nxwm/Makefile
@@ -97,7 +97,7 @@ CXXFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(NXWIDGETDIR
 DEPPATH = --dep-path src
 VPATH = src
 
-all: $(BIN)
+all: check_nuttx $(BIN)
 .PHONY = check_nuttx depend clean distclean export
 
 $(AOBJS): %$(OBJEXT): %.S
@@ -127,7 +127,7 @@ check_nuttx:
 		fi; \
 	)
 
-$(BIN): check_nuttx $(OBJS)
+$(BIN): $(OBJS)
 	@( for obj in $(OBJS) ; do \
 		$(call ARCHIVE, $@, $${obj}); \
 	done ; )