diff --git a/arch/arm/src/sam34/sam_timerisr.c b/arch/arm/src/sam34/sam_timerisr.c
index 46661de57b5..cce13bc0b20 100644
--- a/arch/arm/src/sam34/sam_timerisr.c
+++ b/arch/arm/src/sam34/sam_timerisr.c
@@ -144,9 +144,9 @@ void arm_timer_initialize(void)
   regval |= (NVIC_SYSH_PRIORITY_DEFAULT << NVIC_SYSH_PRIORITY_PR15_SHIFT);
   putreg32(regval, NVIC_SYSH12_15_PRIORITY);
 
+#if 0
   /* Make sure that the SYSTICK clock source is set correctly */
 
-#if 0 /* Does not work.  Comes up with HCLK source and I can't change it */
   regval = getreg32(NVIC_SYSTICK_CTRL);
 #ifdef CONFIG_SAM34_SYSTICK_HCLKd8
   regval &= ~NVIC_SYSTICK_CTRL_CLKSOURCE;
diff --git a/configs/olimex-stm32-p407/dhtxx/defconfig b/configs/olimex-stm32-p407/dhtxx/defconfig
index fc6abb0b800..91336869c70 100644
--- a/configs/olimex-stm32-p407/dhtxx/defconfig
+++ b/configs/olimex-stm32-p407/dhtxx/defconfig
@@ -14,8 +14,6 @@ CONFIG_CDCACM=y
 CONFIG_CDCACM_CONSOLE=y
 CONFIG_DISABLE_POLL=y
 CONFIG_EXAMPLES_DHTXX=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 CONFIG_FAT_LCNAMES=y
 CONFIG_FAT_LFN=y
 CONFIG_FS_FAT=y
@@ -59,6 +57,8 @@ CONFIG_STM32_OTGFS=y
 CONFIG_STM32_PWR=y
 CONFIG_STM32_TIM1=y
 CONFIG_STM32_USART3=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_TASK_NAME_SIZE=32
 CONFIG_USBDEV=y
 CONFIG_USER_ENTRYPOINT="nsh_main"