diff --git a/cc3200/bootmgr/sl/user.h b/cc3200/bootmgr/sl/user.h
index 8ef7677fe5..be93029d1c 100644
--- a/cc3200/bootmgr/sl/user.h
+++ b/cc3200/bootmgr/sl/user.h
@@ -348,7 +348,11 @@ extern "C" {
     \note       belongs to \ref ported_sec
 
 */
-#define sl_DeviceEnablePreamble()		NwpPowerOnPreamble()
+#ifdef DEBUG
+#define sl_DeviceEnablePreamble()       NwpPowerOnPreamble()
+#else
+#define sl_DeviceEnablePreamble()
+#endif
 
 /*!
     \brief		Enable the Network Processor
diff --git a/cc3200/simplelink/cc_pal.c b/cc3200/simplelink/cc_pal.c
index be90104407..cc29ec1fc9 100644
--- a/cc3200/simplelink/cc_pal.c
+++ b/cc3200/simplelink/cc_pal.c
@@ -310,6 +310,7 @@ int spi_Read(Fd_t fd, unsigned char *pBuff, int len)
         return -1;
     }
 
+    MAP_SPIWordCountSet(LSPI_BASE, 0);
     return spi_Read_CPU(pBuff, len);
 }
 
@@ -339,7 +340,8 @@ int spi_Write(Fd_t fd, unsigned char *pBuff, int len)
         return -1;
     }
 
-	return spi_Write_CPU(pBuff,len);
+    MAP_SPIWordCountSet(LSPI_BASE, 0);
+    return spi_Write_CPU(pBuff,len);
 }
 
 /*!
@@ -416,6 +418,7 @@ void NwpUnMaskInterrupt()
 	(*(unsigned long *)REG_INT_MASK_CLR) = 0x1;
 }
 
+#ifdef DEBUG
 /*!
     \brief		Preamble to the enabling the Network Processor.
                         Placeholder to implement any pre-process operations
@@ -465,6 +468,7 @@ void NwpPowerOnPreamble(void)
     /* Stop the networking services */
     NwpPowerOff();
 }
+#endif
 
 /*!
     \brief		Enable the Network Processor
@@ -481,8 +485,9 @@ void NwpPowerOn(void)
 
     //NWP Wakeup
     HWREG(0x44025118) = 1;
-
+#ifdef DEBUG
     UtilsDelay(8000000);
+#endif
 
     //UnMask Host Interrupt
     NwpUnMaskInterrupt();
diff --git a/cc3200/simplelink/user.h b/cc3200/simplelink/user.h
index 3f6a691c4e..af3f14e340 100644
--- a/cc3200/simplelink/user.h
+++ b/cc3200/simplelink/user.h
@@ -349,7 +349,11 @@ extern "C" {
     \note       belongs to \ref ported_sec
 
 */
+#ifdef DEBUG
 #define sl_DeviceEnablePreamble()		NwpPowerOnPreamble()
+#else
+#define sl_DeviceEnablePreamble()
+#endif
 
 /*!
     \brief		Enable the Network Processor