diff --git a/lib/nmea2kto0183/N2kDataToNMEA0183.cpp b/lib/nmea2kto0183/N2kDataToNMEA0183.cpp
index 48d7029..b940eb6 100644
--- a/lib/nmea2kto0183/N2kDataToNMEA0183.cpp
+++ b/lib/nmea2kto0183/N2kDataToNMEA0183.cpp
@@ -1587,9 +1587,7 @@ private:
             return;
         }
         // TODO (?) multiple keys together
-
-        // only process configured key count (default 6)
-        for (uint8_t i=1; i<=6; i++) {
+        for (uint8_t i=1; i<=28; i++) {
             tN2kOnOff keystatus = N2kGetStatusOnBinaryStatus(bankstatus, i);
             if (keystatus == 1) {
                 // key pressed: send key to queue
diff --git a/lib/obp60task/obp60task.cpp b/lib/obp60task/obp60task.cpp
index b570aeb..21f5576 100644
--- a/lib/obp60task/obp60task.cpp
+++ b/lib/obp60task/obp60task.cpp
@@ -620,7 +620,8 @@ void OBP60Task(GwApi *api){
             if (xQueueReceive(keyboardQueue, &remotekey, 0) == pdPASS) {
                 LOG_DEBUG(GwLog::LOG, "OBP received remote key: %d", remotekey);
                 // inject into internal keyboard queue
-                 xQueueSend(allParameters.queue, &remotekey, 0);
+                int injectkey = static_cast<int>(remotekey);
+                xQueueSend(allParameters.queue, &injectkey, 0);
             }
 
             // Check the keyboard message
diff --git a/lib/obp60task/obp60task.h b/lib/obp60task/obp60task.h
index b4e1400..8fa97c0 100644
--- a/lib/obp60task/obp60task.h
+++ b/lib/obp60task/obp60task.h
@@ -18,6 +18,9 @@
         // CAN NMEA2000
         #define ESP32_CAN_TX_PIN 15
         #define ESP32_CAN_RX_PIN 16
+        // Temporary fix for Connection Board
+        // #define ESP32_CAN_TX_PIN 16
+        // #define ESP32_CAN_RX_PIN 15
         // Bus load in 50mA steps
         #define N2K_LOAD_LEVEL 2 // 2x50mA = 100mA max bus load
         // RS485 NMEA0183