diff --git a/Makefile b/Makefile
index a298645e17..5b622ab40f 100644
--- a/Makefile
+++ b/Makefile
@@ -99,17 +99,28 @@ endif
 
 NONFSDIRS	= sched $(ARCH_SRC) $(NUTTX_ADDONS)
 FSDIRS		= fs drivers binfmt
-NETFSDIRS	= fs drivers
 CONTEXTDIRS	= $(APPDIR)
 USERDIRS	=
 
 ifeq ($(CONFIG_NUTTX_KERNEL),y)
+
 NONFSDIRS	+= syscall
 CONTEXTDIRS	+= syscall
 USERDIRS	+= syscall lib mm $(USER_ADDONS)
+ifeq ($(CONFIG_HAVE_CXX),y)
+USERDIRS	+= libxx
+endif
+
 else
+
 NONFSDIRS	+= lib mm
 OTHERDIRS	+= syscall $(USER_ADDONS)
+ifeq ($(CONFIG_HAVE_CXX),y)
+NONFSDIRS	+= libxx
+else
+OTHERDIRS	+= libxx
+endif
+
 endif
 
 ifeq ($(CONFIG_NX),y)
@@ -183,7 +194,7 @@ else
 NUTTXLIBS	+= mm/libmm$(LIBEXT) lib/liblib$(LIBEXT)
 endif
 
-# Add libraries for network support.  CXX, CXXFLAGS, and COMPILEXX must
+# Add libraries for C++ support.  CXX, CXXFLAGS, and COMPILEXX must
 # be defined in Make.defs for this to work!
 
 ifeq ($(CONFIG_HAVE_CXX),y)
diff --git a/arch/arm/src/sam3u/sam3u_spi.c b/arch/arm/src/sam3u/sam3u_spi.c
index d16598c713..4c3462eef7 100644
--- a/arch/arm/src/sam3u/sam3u_spi.c
+++ b/arch/arm/src/sam3u/sam3u_spi.c
@@ -816,6 +816,10 @@ FAR struct spi_dev_s *up_spiinitialize(int port)
   sam3u_configgpio(GPIO_SPI0_MOSI);
   sam3u_configgpio(GPIO_SPI0_SPCK);
 
+  /* Disable SPI clocking */
+
+  putreg32(SPI_CR_SPIDIS, SAM3U_SPI_CR);
+
   /* Execute a software reset of the SPI (twice) */
 
   putreg32(SPI_CR_SWRST, SAM3U_SPI_CR);
diff --git a/configs/sam3u-ek/src/up_touchscreen.c b/configs/sam3u-ek/src/up_touchscreen.c
index 699c245b78..9b58f151c4 100755
--- a/configs/sam3u-ek/src/up_touchscreen.c
+++ b/configs/sam3u-ek/src/up_touchscreen.c
@@ -200,14 +200,14 @@ static bool tsc_pendown(FAR struct ads7843e_config_s *state)
  ****************************************************************************/
 
 /****************************************************************************
- * Name: up_tcinitialize
+ * Name: arch_tcinitialize
  *
  * Description:
  *   Initialize the touchscreen device
  *
  ****************************************************************************/
 
-int up_tcinitialize(void)
+int arch_tcinitialize(void)
 {
   FAR struct spi_dev_s *dev;
   int ret;
@@ -244,4 +244,19 @@ int up_tcinitialize(void)
 
   return OK;
 }
-#endif /* CONFIG_INPUT_ADS7843E */
\ No newline at end of file
+
+/****************************************************************************
+ * Name: arch_tcuninitialize
+ *
+ * Description:
+ *   Un-initialize the touchscreen device
+ *
+ ****************************************************************************/
+
+void arch_tcuninitialize(void)
+{
+  /* No support for un-initializing the touchscreen ADS7843E device yet */
+}
+
+#endif /* CONFIG_INPUT_ADS7843E */
+
diff --git a/configs/sam3u-ek/touchscreen/defconfig b/configs/sam3u-ek/touchscreen/defconfig
index f6eab150a5..fb5868f581 100755
--- a/configs/sam3u-ek/touchscreen/defconfig
+++ b/configs/sam3u-ek/touchscreen/defconfig
@@ -1061,7 +1061,7 @@ CONFIG_EXAMPLES_NXLINES_EXTERNINIT=n
 #   collected and the program terminates.  Default:  Samples are collected
 #   indefinitely.
 #
-CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN=n
+CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN=y
 CONFIG_EXAMPLES_TOUCHSCREEN_MINOR=0
 CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH="/dev/input0"
 CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES=25
diff --git a/libxx/Makefile b/libxx/Makefile
index 38e3d3a73f..0326e64e45 100755
--- a/libxx/Makefile
+++ b/libxx/Makefile
@@ -65,7 +65,7 @@ $(BIN):	$(OBJS)
 	done ; )
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep
 	@touch $@
 
 depend: .depend