diff --git a/arch/arm/src/kinetis/kinetis_config.h b/arch/arm/src/kinetis/kinetis_config.h
index 9f9b0cbf7e3..732dd403c43 100644
--- a/arch/arm/src/kinetis/kinetis_config.h
+++ b/arch/arm/src/kinetis/kinetis_config.h
@@ -84,7 +84,7 @@
 #  undef CONFIG_KINETIS_LPUART0
 #endif
 
-/* Are any UARTs enabled? */
+/* Are any UARTs or LPUARTs enabled? */
 
 #undef HAVE_UART_DEVICE
 #if defined(CONFIG_KINETIS_UART0) || defined(CONFIG_KINETIS_UART1) || \
diff --git a/arch/arm/src/kinetis/kinetis_serial.c b/arch/arm/src/kinetis/kinetis_serial.c
index c7ffc5a8479..73293b53cd6 100644
--- a/arch/arm/src/kinetis/kinetis_serial.c
+++ b/arch/arm/src/kinetis/kinetis_serial.c
@@ -1315,7 +1315,7 @@ void up_serialinit(void)
  *
  ****************************************************************************/
 
-#ifndef HAVE_UART_PUTC
+#ifdef HAVE_UART_PUTC
 int up_putc(int ch)
 {
 #ifdef HAVE_UART_CONSOLE
@@ -1350,7 +1350,7 @@ int up_putc(int ch)
  *
  ****************************************************************************/
 
-#ifndef HAVE_UART_PUTC
+#ifdef HAVE_UART_PUTC
 int up_putc(int ch)
 {
 #ifdef HAVE_UART_CONSOLE
diff --git a/include/nuttx/wireless/cc3000.h b/include/nuttx/wireless/cc3000.h
index 4d038efea27..6aa234ed560 100644
--- a/include/nuttx/wireless/cc3000.h
+++ b/include/nuttx/wireless/cc3000.h
@@ -56,14 +56,14 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-#define DEV_FORMAT   "/dev/wireless%d" /* The device Name*/
-#define DEV_NAMELEN  17                /* The buffer size to hold formatted string*/
+#define DEV_FORMAT    "/dev/wireless%d" /* The device Name*/
+#define DEV_NAMELEN   17                /* The buffer size to hold formatted string*/
 
-#define QUEUE_FORMAT   "wlq%d"         /* The Queue name */
-#define QUEUE_NAMELEN  8               /* The buffer size to hold formatted string*/
+#define QUEUE_FORMAT  "wlq%d"           /* The Queue name */
+#define QUEUE_NAMELEN 8                 /* The buffer size to hold formatted string*/
 
-#define SEM_FORMAT   "wls%d"           /* The Spi Resume Senaphore name*/
-#define SEM_NAMELEN   8                /* The buffer size to hold formatted string*/
+#define SEM_FORMAT    "wls%d"           /* The Spi Resume Senaphore name*/
+#define SEM_NAMELEN   8                 /* The buffer size to hold formatted string*/
 
 /* IOCTL commands */