diff --git a/configs/samd20-xplained/README.txt b/configs/samd20-xplained/README.txt
index 782b821131..149a776de5 100644
--- a/configs/samd20-xplained/README.txt
+++ b/configs/samd20-xplained/README.txt
@@ -420,7 +420,7 @@ Serial Consoles
 
   The SAMD20 Xplained Pro contains an Embedded Debugger (EDBG) that can be
   used to program and debug the ATSAMD20J18A using Serial Wire Debug (SWD).
-  The Embedded debugger also include a Virtual Com port interface over
+  The Embedded debugger also include a Virtual COM port interface over
   SERCOM3.  Virtual COM port connections:
 
     PA24 SERCOM3 / USART TXD
diff --git a/configs/samd20-xplained/include/board.h b/configs/samd20-xplained/include/board.h
index 7893b5bbe7..d8334c8240 100644
--- a/configs/samd20-xplained/include/board.h
+++ b/configs/samd20-xplained/include/board.h
@@ -373,7 +373,7 @@
 
 /* The SAMD20 Xplained Pro contains an Embedded Debugger (EDBG) that can be
  * used to program and debug the ATSAMD20J18A using Serial Wire Debug (SWD).
- * The Embedded debugger also include a Virtual Com port interface over
+ * The Embedded debugger also include a Virtual COM port interface over
  * SERCOM3.  Virtual COM port connections:
  *
  *   PA24 SERCOM3 / USART TXD
diff --git a/configs/samd20-xplained/nsh/defconfig b/configs/samd20-xplained/nsh/defconfig
index f0a65c99fe..61abc85a7c 100644
--- a/configs/samd20-xplained/nsh/defconfig
+++ b/configs/samd20-xplained/nsh/defconfig
@@ -186,7 +186,7 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
-CONFIG_ARCH_IRQPRIO=y
+# CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
 # CONFIG_ARCH_HAVE_RAMFUNCS is not set