diff --git a/src/AccelerometerThread.h b/src/AccelerometerThread.h
index c2910007e..c39504c08 100644
--- a/src/AccelerometerThread.h
+++ b/src/AccelerometerThread.h
@@ -94,8 +94,9 @@ class AccelerometerThread : public concurrency::OSThread
                 wakeScreen();
                 return 500;
             }
-#ifdef RAK_4631
-        } else if (acceleremoter_type == ScanI2C::DeviceType::BMX160) {
+#if defined(RAK_4631)
+#if !defined (MESHTASTIC_EXCLUDE_SCREEN)
+		} else if (acceleremoter_type == ScanI2C::DeviceType::BMX160) {
             sBmx160SensorData_t magAccel;
             sBmx160SensorData_t gAccel;
 
@@ -165,7 +166,7 @@ class AccelerometerThread : public concurrency::OSThread
             }
 
             screen->setHeading(heading);
-
+#endif
 #endif
         } else if (acceleremoter_type == ScanI2C::DeviceType::LSM6DS3 && lsm.shake()) {
             wakeScreen();
@@ -230,9 +231,10 @@ class AccelerometerThread : public concurrency::OSThread
             // It corresponds to isDoubleClick interrupt
             bmaSensor.enableWakeupIRQ();
 #ifdef RAK_4631
-        } else if (acceleremoter_type == ScanI2C::DeviceType::BMX160 && bmx160.begin()) {
+#if !defined(MESHTASTIC_EXCLUDE_SCREEN)
+		} else if (acceleremoter_type == ScanI2C::DeviceType::BMX160 && bmx160.begin()) {
             bmx160.ODR_Config(BMX160_ACCEL_ODR_100HZ, BMX160_GYRO_ODR_100HZ); // set output data rate
-
+#endif
 #endif
         } else if (acceleremoter_type == ScanI2C::DeviceType::LSM6DS3 && lsm.begin_I2C(accelerometer_found.address)) {
             LOG_DEBUG("LSM6DS3 initializing\n");
@@ -265,8 +267,8 @@ class AccelerometerThread : public concurrency::OSThread
     Adafruit_LSM6DS3TRC lsm;
     SensorBMA423 bmaSensor;
     bool BMA_IRQ = false;
-#ifdef RAK_4631
-    bool showingScreen = false;
+#if defined(RAK_4631) && !defined(MESHTASTIC_EXCLUDE_SCREEN)
+	bool showingScreen = false;
     RAK_BMX160 bmx160;
     float highestX = 0, lowestX = 0, highestY = 0, lowestY = 0, highestZ = 0, lowestZ = 0;
 
diff --git a/src/platform/nrf52/NRF52Bluetooth.cpp b/src/platform/nrf52/NRF52Bluetooth.cpp
index 1405ea4f3..177255b2f 100644
--- a/src/platform/nrf52/NRF52Bluetooth.cpp
+++ b/src/platform/nrf52/NRF52Bluetooth.cpp
@@ -310,7 +310,9 @@ bool NRF52Bluetooth::onPairingPasskey(uint16_t conn_handle, uint8_t const passke
 {
     LOG_INFO("BLE pairing process started with passkey %.3s %.3s\n", passkey, passkey + 3);
     powerFSM.trigger(EVENT_BLUETOOTH_PAIR);
-    screen->startAlert([](OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y) -> void {
+#if !defined(MESHTASTIC_EXCLUDE_SCREEN)
+	screen->startAlert([](OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y) -> void
+					   {
         char btPIN[16] = "888888";
         snprintf(btPIN, sizeof(btPIN), "%06u", configuredPasskey);
         int x_offset = display->width() / 2;
@@ -333,9 +335,9 @@ bool NRF52Bluetooth::onPairingPasskey(uint16_t conn_handle, uint8_t const passke
         String deviceName = "Name: ";
         deviceName.concat(getDeviceName());
         y_offset = display->height() == 64 ? y_offset + FONT_HEIGHT_LARGE - 6 : y_offset + FONT_HEIGHT_LARGE + 5;
-        display->drawString(x_offset + x, y_offset + y, deviceName);
-    });
-    if (match_request) {
+        display->drawString(x_offset + x, y_offset + y, deviceName); });
+#endif
+	if (match_request) {
         uint32_t start_time = millis();
         while (millis() < start_time + 30000) {
             if (!Bluefruit.connected(conn_handle))
diff --git a/variants/rak4631_eth_gw/platformio.ini b/variants/rak4631_eth_gw/platformio.ini
index bf8713293..62b7e737d 100644
--- a/variants/rak4631_eth_gw/platformio.ini
+++ b/variants/rak4631_eth_gw/platformio.ini
@@ -12,11 +12,11 @@ build_flags = ${nrf52840_base.build_flags} -Ivariants/rak4631_eth_gw -D RAK_4631
   -DNRF52_USE_JSON=1
   -DMESHTASTIC_EXCLUDE_GPS=1
   -DMESHTASTIC_EXCLUDE_WIFI=1
-;   -DMESHTASTIC_EXCLUDE_SCREEN=1
+  -DMESHTASTIC_EXCLUDE_SCREEN=1
 ;   -DMESHTASTIC_EXCLUDE_PKI=1
   -DMESHTASTIC_EXCLUDE_POWER_FSM=1
   -DMESHTASTIC_EXCLUDE_POWERMON=1
-  -DMESHTASTIC_EXCLUDE_TZ=1
+;   -DMESHTASTIC_EXCLUDE_TZ=1
   -DMESHTASTIC_EXCLUDE_EXTERNALNOTIFICATION=1
   -DMESHTASTIC_EXCLUDE_PAXCOUNTER=1
   -DMESHTASTIC_EXCLUDE_REMOTEHARDWARE=1