diff --git a/PS3BT.cpp b/PS3BT.cpp
index 742591fa..8381370b 100644
--- a/PS3BT.cpp
+++ b/PS3BT.cpp
@@ -632,6 +632,6 @@ void PS3BT::onInit() {
                 if(PS3MoveConnected)
                         moveSetBulb(Red);
                 else // Dualshock 3 or Navigation controller
-                        setLedOn(LED1);
+                        setLedOn(static_cast<LEDEnum>(LED1));
         }
 }
diff --git a/PS3USB.cpp b/PS3USB.cpp
index cfa5f978..b14e67c7 100755
--- a/PS3USB.cpp
+++ b/PS3USB.cpp
@@ -569,6 +569,6 @@ void PS3USB::onInit() {
                 if(PS3MoveConnected)
                         moveSetBulb(Red);
                 else // Dualshock 3 or Navigation controller
-                        setLedOn(LED1);
+                        setLedOn(static_cast<LEDEnum>(LED1));
         }
 }
diff --git a/SPP.h b/SPP.h
index 233ac611..bb3027b4 100644
--- a/SPP.h
+++ b/SPP.h
@@ -120,7 +120,9 @@ public:
          */
         size_t write(const uint8_t* data, size_t size);
         /** Pull in write(const char *str) from Print */
+#if !defined(RBL_NRF51822)
         using Print::write;
+#endif
 #else
         /**
          * Writes the byte to send to a buffer. The message is send when either send() or after Usb.Task() is called.
diff --git a/XBOXRECV.cpp b/XBOXRECV.cpp
index 39e14ef8..7431fa43 100644
--- a/XBOXRECV.cpp
+++ b/XBOXRECV.cpp
@@ -572,13 +572,13 @@ void XBOXRECV::onInit(uint8_t controller) {
         else {
                 LEDEnum led;
                 if(controller == 0)
-                        led = LED1;
+                        led = static_cast<LEDEnum>(LED1);
                 else if(controller == 1)
-                        led = LED2;
+                        led = static_cast<LEDEnum>(LED2);
                 else if(controller == 2)
-                        led = LED3;
+                        led = static_cast<LEDEnum>(LED3);
                 else
-                        led = LED4;
+                        led = static_cast<LEDEnum>(LED4);
                 setLedOn(led, controller);
         }
 }
diff --git a/XBOXUSB.cpp b/XBOXUSB.cpp
index ce69f82b..6799029d 100644
--- a/XBOXUSB.cpp
+++ b/XBOXUSB.cpp
@@ -358,5 +358,5 @@ void XBOXUSB::onInit() {
         if(pFuncOnInit)
                 pFuncOnInit(); // Call the user function
         else
-                setLedOn(LED1);
+                setLedOn(static_cast<LEDEnum>(LED1));
 }
diff --git a/controllerEnums.h b/controllerEnums.h
index 47fd975e..e51f15ca 100644
--- a/controllerEnums.h
+++ b/controllerEnums.h
@@ -26,11 +26,12 @@
 /** Enum used to turn on the LEDs on the different controllers. */
 enum LEDEnum {
         OFF = 0,
+#ifndef RBL_NRF51822
         LED1 = 1,
         LED2 = 2,
         LED3 = 3,
         LED4 = 4,
-
+#endif
         LED5 = 5,
         LED6 = 6,
         LED7 = 7,
diff --git a/settings.h b/settings.h
index 6c1979af..97b46a0b 100644
--- a/settings.h
+++ b/settings.h
@@ -135,8 +135,13 @@ e-mail   :  support@circuitsathome.com
 #define USING_SPI4TEENSY3 0
 #endif
 
-#if ((defined(ARDUINO_SAM_DUE) && defined(__SAM3X8E__)) || defined(RBL_NRF51822) || defined(__ARDUINO_X86__) || ARDUINO >= 10600) && !USING_SPI4TEENSY3
-#include <SPI.h> // Use the Arduino SPI library for the Arduino Due, RedBearLab nRF51822, Intel Galileo 1 & 2, Intel Edison or if the SPI library with transaction is available
+#if ((defined(ARDUINO_SAM_DUE) && defined(__SAM3X8E__)) || defined(__ARDUINO_X86__) || ARDUINO >= 10600) && !USING_SPI4TEENSY3
+#include <SPI.h> // Use the Arduino SPI library for the Arduino Due, Intel Galileo 1 & 2, Intel Edison or if the SPI library with transaction is available
+#endif
+#ifdef RBL_NRF51822
+#include <nrf_gpio.h>
+#include <SPI_Master.h>
+#define SPI SPI_Master
 #endif
 #if defined(__PIC32MX__) || defined(__PIC32MZ__)
 #include <../../../../hardware/pic32/libraries/SPI/SPI.h> // Hack to use the SPI library