diff --git a/src/PowerFSM.cpp b/src/PowerFSM.cpp
index 67550710..c16f5259 100644
--- a/src/PowerFSM.cpp
+++ b/src/PowerFSM.cpp
@@ -240,7 +240,7 @@ void PowerFSM_setup()
     bool isRouter = (config.device.role == Config_DeviceConfig_Role_ROUTER ? 1 : 0);
     bool hasPower = isPowered();
 
-    DEBUG_MSG("PowerFSM init, USB power=%d\n", hasPower);
+    DEBUG_MSG("PowerFSM init, USB power=%d\n", hasPower ? 1 : 0);
     powerFSM.add_timed_transition(&stateBOOT, hasPower ? &statePOWER : &stateON, 3 * 1000, NULL, "boot timeout");
 
     // wake timer expired or a packet arrived
diff --git a/src/gps/GPS.cpp b/src/gps/GPS.cpp
index 24453423..c4cdb39b 100644
--- a/src/gps/GPS.cpp
+++ b/src/gps/GPS.cpp
@@ -145,7 +145,7 @@ bool GPS::setupGPS()
     if (_serial_gps && !didSerialInit) {
         didSerialInit = true;
 
-#if CONFIG_IDF_TARGET_ESP32S3
+#ifdef ARCH_ESP32
     // In esp32s3 framework, setRxBufferSize needs to be initialized before Serial
     _serial_gps->setRxBufferSize(2048); // the default is 256
 #endif
@@ -157,11 +157,6 @@ bool GPS::setupGPS()
         _serial_gps->begin(GPS_BAUDRATE);
 #endif
 
-#if CONFIG_IDF_TARGET_ESP32
-        _serial_gps->setRxBufferSize(2048); // the default is 256
-#endif
-
-
 #ifdef LILYGO_TBEAM_S3_CORE
         /*
         * T-Beam-S3-Core will be preset to use gps Probe here, and other boards will not be changed first