diff --git a/Dockerfile b/Dockerfile
index 8f4059d..ca62fca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ghcr.io/wiiu-env/devkitppc:20241128
 
-COPY --from=ghcr.io/wiiu-env/libbuttoncombo:20241231-a2f949b /artifacts $DEVKITPRO
+COPY --from=ghcr.io/wiiu-env/libbuttoncombo:20250104-0663ede /artifacts $DEVKITPRO
 COPY --from=ghcr.io/wiiu-env/libfunctionpatcher:20241012 /artifacts $DEVKITPRO
 COPY --from=ghcr.io/wiiu-env/wiiumodulesystem:20240424 /artifacts $DEVKITPRO
 
diff --git a/source/ButtonComboManager.cpp b/source/ButtonComboManager.cpp
index 9e62b76..914dd60 100644
--- a/source/ButtonComboManager.cpp
+++ b/source/ButtonComboManager.cpp
@@ -126,6 +126,22 @@ namespace {
             conv_buttons |= BCMPAD_BUTTON_MINUS;
         }
 
+        if (buttons & WPAD_BUTTON_1) {
+            conv_buttons |= BCMPAD_BUTTON_1;
+        }
+
+        if (buttons & WPAD_BUTTON_2) {
+            conv_buttons |= BCMPAD_BUTTON_2;
+        }
+
+        if (buttons & WPAD_BUTTON_C) {
+            conv_buttons |= BCMPAD_BUTTON_C;
+        }
+
+        if (buttons & WPAD_BUTTON_Z) {
+            conv_buttons |= BCMPAD_BUTTON_Z;
+        }
+
         return conv_buttons;
     }
 
diff --git a/source/ButtonComboManager.h b/source/ButtonComboManager.h
index ecb1591..69dcc1c 100644
--- a/source/ButtonComboManager.h
+++ b/source/ButtonComboManager.h
@@ -19,7 +19,7 @@ class ButtonComboManager {
 
     static std::optional<std::shared_ptr<ButtonComboInfoIF>> CreateComboInfo(const ButtonComboModule_ComboOptions &options, ButtonComboModule_Error &err);
 
-    ButtonComboInfoIF *GetComboInfoForHandle(ButtonComboModule_ComboHandle handle) const;
+    [[nodiscard]] ButtonComboInfoIF *GetComboInfoForHandle(ButtonComboModule_ComboHandle handle) const;
 
     void UpdateInputVPAD(VPADChan chan, const VPADStatus *buffer, uint32_t bufferSize, const VPADReadError *error);
 
@@ -27,7 +27,6 @@ class ButtonComboManager {
 
     bool hasActiveComboWithTVButton();
 
-
     ButtonComboModule_ComboStatus CheckComboStatus(const ButtonComboInfoIF &other);
 
     void AddCombo(std::shared_ptr<ButtonComboInfoIF> newComboInfo, ButtonComboModule_ComboHandle &outHandle, ButtonComboModule_ComboStatus &outStatus);
diff --git a/source/main.cpp b/source/main.cpp
index 6f36e4e..74123f6 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -32,7 +32,6 @@ WUMS_INITIALIZE() {
     }
     DEBUG_FUNCTION_LINE("Patch ButtonComboModule functions finished");
 
-
     gButtonComboManager = std::make_unique<ButtonComboManager>();
 
     deinitLogging();