diff --git a/src/input/ButtonThread.h b/src/input/ButtonThread.h
index 890ba8a0e..f3d33c5ab 100644
--- a/src/input/ButtonThread.h
+++ b/src/input/ButtonThread.h
@@ -71,7 +71,6 @@ class ButtonThread : public Observable<const InputEvent *>, public concurrency::
     int afterLightSleep(esp_sleep_wakeup_cause_t cause);
 #endif
   private:
-    input_broker_event currentEvent;
     input_broker_event _singlePress = INPUT_BROKER_NONE;
     input_broker_event _longPress = INPUT_BROKER_NONE;
     input_broker_event _doublePress = INPUT_BROKER_NONE;
diff --git a/src/main.cpp b/src/main.cpp
index 43875e366..0d63aa3f4 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -882,7 +882,7 @@ void setup()
     setupModules();
 
 // buttons are now inputBroker, so have to come after setupModules
-#if defined(HAS_BUTTON)
+#if HAS_BUTTON
     int pullup_sense = 0;
 #ifdef INPUT_PULLUP_SENSE
     // Some platforms (nrf52) have a SENSE variant which allows wake from sleep - override what OneButton did
diff --git a/src/modules/Modules.cpp b/src/modules/Modules.cpp
index 97f56a030..f7e15db7c 100644
--- a/src/modules/Modules.cpp
+++ b/src/modules/Modules.cpp
@@ -111,9 +111,9 @@ void setupModules()
 #if (HAS_BUTTON || ARCH_PORTDUINO) && !MESHTASTIC_EXCLUDE_INPUTBROKER
         if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_COLOR) {
             inputBroker = new InputBroker();
+            systemCommandsModule = new SystemCommandsModule();
         }
 #endif
-        systemCommandsModule = new SystemCommandsModule();
 #if !MESHTASTIC_EXCLUDE_ADMIN
         adminModule = new AdminModule();
 #endif