diff --git a/arch/stm32/stm32.ini b/arch/stm32/stm32.ini
index be1ed662f..03e0bf392 100644
--- a/arch/stm32/stm32.ini
+++ b/arch/stm32/stm32.ini
@@ -23,11 +23,11 @@ build_flags =
   -DMESHTASTIC_EXCLUDE_SCREEN=1
   -DMESHTASTIC_EXCLUDE_MQTT=1
   -DMESHTASTIC_EXCLUDE_BLUETOOTH=1
-  -DMESHTASTIC_EXCLUDE_GPS=1
   -DMESHTASTIC_EXCLUDE_WIFI=1
   -DMESHTASTIC_EXCLUDE_TZ=1 ; Exclude TZ to save some flash space.
+  -DSERIAL_RX_BUFFER_SIZE=256 ; For GPS - the default of 64 is too small.
   -DPIO_FRAMEWORK_ARDUINO_NANOLIB_FLOAT_PRINTF ; This is REQUIRED for at least traceroute debug prints - without it the length ends up uninitialized.
-  ;-DDEBUG_MUTE
+  -DDEBUG_MUTE ; You can #undef DEBUG_MUTE in certain source files if you need the logs.
   -fmerge-all-constants
   -ffunction-sections
   -fdata-sections
diff --git a/src/gps/GPS.cpp b/src/gps/GPS.cpp
index 345c738d6..3a6b19f64 100644
--- a/src/gps/GPS.cpp
+++ b/src/gps/GPS.cpp
@@ -39,9 +39,9 @@ template <typename T, std::size_t N> std::size_t array_count(const T (&)[N])
     return N;
 }
 
-#if defined(NRF52840_XXAA) || defined(NRF52833_XXAA) || defined(ARCH_ESP32) || defined(ARCH_PORTDUINO)
-#if defined(RAK2560)
-HardwareSerial *GPS::_serial_gps = &Serial2;
+#if defined(NRF52840_XXAA) || defined(NRF52833_XXAA) || defined(ARCH_ESP32) || defined(ARCH_PORTDUINO) || defined(ARCH_STM32WL)
+#if defined(GPS_SERIAL_PORT)
+HardwareSerial *GPS::_serial_gps = &GPS_SERIAL_PORT;
 #else
 HardwareSerial *GPS::_serial_gps = &Serial1;
 #endif
diff --git a/src/modules/PositionModule.cpp b/src/modules/PositionModule.cpp
index 93c65ecc1..8b6a9f19c 100644
--- a/src/modules/PositionModule.cpp
+++ b/src/modules/PositionModule.cpp
@@ -266,9 +266,11 @@ meshtastic_MeshPacket *PositionModule::allocPositionPacket()
 
     LOG_INFO("Position packet: time=%i lat=%i lon=%i", p.time, p.latitude_i, p.longitude_i);
 
+#ifndef MESHTASTIC_EXCLUDE_ATAK
     // TAK Tracker devices should send their position in a TAK packet over the ATAK port
     if (config.device.role == meshtastic_Config_DeviceConfig_Role_TAK_TRACKER)
         return allocAtakPli();
+#endif
 
     return allocDataProtobuf(p);
 }
diff --git a/variants/rak2560/variant.h b/variants/rak2560/variant.h
index a03fc3933..f922e8a61 100644
--- a/variants/rak2560/variant.h
+++ b/variants/rak2560/variant.h
@@ -222,6 +222,7 @@ SO GPIO 39/TXEN MAY NOT BE DEFINED FOR SUCCESSFUL OPERATION OF THE SX1262 - TG
 // #define PIN_GPS_EN PIN_3V3_EN
 #define PIN_GPS_PPS (17) // Pulse per second input from the GPS
 
+#define GPS_SERIAL_PORT Serial2
 // On RAK2560 the GPS is be on a different UART
 // #define GPS_RX_PIN PIN_SERIAL2_RX
 // #define GPS_TX_PIN PIN_SERIAL2_TX
diff --git a/variants/wio-e5/platformio.ini b/variants/wio-e5/platformio.ini
index 1ef7abd78..90251c7aa 100644
--- a/variants/wio-e5/platformio.ini
+++ b/variants/wio-e5/platformio.ini
@@ -15,7 +15,12 @@ build_flags =
   -DRADIOLIB_EXCLUDE_SX128X=1
   -DRADIOLIB_EXCLUDE_SX127X=1
   -DRADIOLIB_EXCLUDE_LR11X0=1
-  -DHAS_SENSOR
+  -DHAS_SENSOR=1
+  -DENABLE_HWSERIAL2
+  -DPIN_SERIAL2_TX=PA2
+  -DPIN_SERIAL2_RX=PA3
+  -DHAS_GPS=1
+  -DGPS_SERIAL_PORT=Serial2
 
 upload_port = stlink
 
diff --git a/variants/wio-e5/variant.h b/variants/wio-e5/variant.h
index 5421eaeb9..6098b4ce6 100644
--- a/variants/wio-e5/variant.h
+++ b/variants/wio-e5/variant.h
@@ -17,6 +17,8 @@ Do not expect a working Meshtastic device with this target.
 #define LED_PIN PB5
 #define LED_STATE_ON 1
 
+#define WIO_E5
+
 #if (defined(LED_BUILTIN) && LED_BUILTIN == PNUM_NOT_DEFINED)
 #undef LED_BUILTIN
 #define LED_BUILTIN (LED_PIN)