diff --git a/BTD.cpp b/BTD.cpp
index 321ab324..b7578a09 100644
--- a/BTD.cpp
+++ b/BTD.cpp
@@ -364,7 +364,7 @@ void BTD::HCI_event_task() {
                     Serial.print(hcibuf[2]);
 #endif
                     for(uint8_t i = 0; i < hcibuf[2]; i++) {
-                        if(hcibuf[4+8*hcibuf[2]+3*i] == 0x04 && hcibuf[5+8*hcibuf[2]+3*i] == 0x25 && hcibuf[6+8*hcibuf[2]+3*i] == 0x00) { // See http://bluetooth-pentest.narod.ru/software/bluetooth_class_of_device-service_generator.html
+                        if((hcibuf[4+8*hcibuf[2]+3*i] == 0x04 && hcibuf[5+8*hcibuf[2]+3*i] == 0x25 && hcibuf[6+8*hcibuf[2]+3*i] == 0x00) || (hcibuf[4+8*hcibuf[2]+3*i] == 0x08 && hcibuf[5+8*hcibuf[2]+3*i] == 0x05 && hcibuf[6+8*hcibuf[2]+3*i] == 0x00)) { // See http://bluetooth-pentest.narod.ru/software/bluetooth_class_of_device-service_generator.html and http://wiibrew.org/wiki/Wiimote#SDP_information
                             disc_bdaddr[0] = hcibuf[3+6*i];
                             disc_bdaddr[1] = hcibuf[4+6*i];
                             disc_bdaddr[2] = hcibuf[5+6*i];
diff --git a/Wii.cpp b/Wii.cpp
index 3227210b..fbf2e7f9 100644
--- a/Wii.cpp
+++ b/Wii.cpp
@@ -281,6 +281,7 @@ void WII::ACLData(uint8_t* l2capinbuf) {
 #endif                                      
                             break;
                         case 0x30: // Core buttons - (a1) 30 BB BB
+                            break;
                         case 0x31: // Core Buttons and Accelerometer - (a1) 31 BB BB AA AA AA
                             pitch = wiiMotePitch; // The pitch is just equal to the angle calculated from the wiimote as there is no Motion Plus connected
                             roll = wiiMoteRoll;