diff --git a/BTHID.cpp b/BTHID.cpp
index a5353f65..5d1451a9 100644
--- a/BTHID.cpp
+++ b/BTHID.cpp
@@ -68,7 +68,7 @@ void BTHID::ACLData(uint8_t* l2capinbuf) {
                         }
                 }
         }
-        if ((l2capinbuf[0] | (l2capinbuf[1] << 8)) == (hci_handle | 0x2000U)) { // acl_handle_ok or it's a new connection
+        if ((l2capinbuf[0] | (uint16_t)l2capinbuf[1] << 8) == (hci_handle | 0x2000U)) { // acl_handle_ok or it's a new connection
                 if ((l2capinbuf[6] | (l2capinbuf[7] << 8)) == 0x0001U) { // l2cap_control - Channel ID for ACL-U
                         if (l2capinbuf[8] == L2CAP_CMD_COMMAND_REJECT) {
 #ifdef DEBUG_USB_HOST
diff --git a/PS3BT.cpp b/PS3BT.cpp
index 7745e38e..ac185576 100644
--- a/PS3BT.cpp
+++ b/PS3BT.cpp
@@ -250,9 +250,9 @@ void PS3BT::ACLData(uint8_t* ACLData) {
                         }
                 }
         }
-        if (((ACLData[0] | (ACLData[1] << 8)) == (hci_handle | 0x2000))) { //acl_handle_ok
+        if ((ACLData[0] | (uint16_t)ACLData[1] << 8) == (hci_handle | 0x2000U)) { //acl_handle_ok
                 memcpy(l2capinbuf, ACLData, BULK_MAXPKTSIZE);
-                if ((l2capinbuf[6] | (l2capinbuf[7] << 8)) == 0x0001) { //l2cap_control - Channel ID for ACL-U
+                if ((l2capinbuf[6] | (l2capinbuf[7] << 8)) == 0x0001U) { //l2cap_control - Channel ID for ACL-U
                         if (l2capinbuf[8] == L2CAP_CMD_COMMAND_REJECT) {
 #ifdef DEBUG_USB_HOST
                                 Notify(PSTR("\r\nL2CAP Command Rejected - Reason: "), 0x80);
diff --git a/SPP.cpp b/SPP.cpp
index 9f9dd46f..670b91dc 100644
--- a/SPP.cpp
+++ b/SPP.cpp
@@ -97,7 +97,7 @@ void SPP::ACLData(uint8_t* l2capinbuf) {
                         }
                 }
         }
-        if (((l2capinbuf[0] | (l2capinbuf[1] << 8)) == (hci_handle | 0x2000U))) { // acl_handle_ok
+        if ((l2capinbuf[0] | (uint16_t)l2capinbuf[1] << 8) == (hci_handle | 0x2000U)) { // acl_handle_ok
                 if ((l2capinbuf[6] | (l2capinbuf[7] << 8)) == 0x0001U) { //l2cap_control - Channel ID for ACL-U
                         if (l2capinbuf[8] == L2CAP_CMD_COMMAND_REJECT) {
 #ifdef DEBUG_USB_HOST
diff --git a/Wii.cpp b/Wii.cpp
index 91e6ff49..e0d79707 100755
--- a/Wii.cpp
+++ b/Wii.cpp
@@ -144,7 +144,7 @@ void WII::ACLData(uint8_t* l2capinbuf) {
                         }
                 }
         }
-        if ((l2capinbuf[0] | (l2capinbuf[1] << 8)) == (hci_handle | 0x2000U)) { // acl_handle_ok or it's a new connection
+        if ((l2capinbuf[0] | (uint16_t)l2capinbuf[1] << 8) == (hci_handle | 0x2000U)) { // acl_handle_ok or it's a new connection
                 if ((l2capinbuf[6] | (l2capinbuf[7] << 8)) == 0x0001U) { //l2cap_control - Channel ID for ACL-U
                         if (l2capinbuf[8] == L2CAP_CMD_COMMAND_REJECT) {
 #ifdef DEBUG_USB_HOST