diff --git a/src/buzz/buzz.cpp b/src/buzz/buzz.cpp
index a667df004..279c64842 100644
--- a/src/buzz/buzz.cpp
+++ b/src/buzz/buzz.cpp
@@ -1,10 +1,6 @@
 #include "buzz.h"
 #include "configuration.h"
 
-#ifdef NRF52_SERIES
-#include "variant.h"
-#endif
-
 #ifndef PIN_BUZZER
 
 // Noop methods for boards w/o buzzer
diff --git a/variants/heltec_v1/variant.h b/variants/heltec_v1/variant.h
index 7e1af42d1..9ea07eb0c 100644
--- a/variants/heltec_v1/variant.h
+++ b/variants/heltec_v1/variant.h
@@ -3,7 +3,7 @@
 #undef GPS_RX_PIN
 #undef GPS_TX_PIN
 #define GPS_RX_PIN 36
-#define GPS_TX_PIN 34
+#define GPS_TX_PIN 33
 
 #ifndef USE_JTAG  // gpio15 is TDO for JTAG, so no I2C on this board while doing jtag
 #define I2C_SDA 4 // I2C pins for this board
@@ -20,8 +20,8 @@
 #ifndef USE_JTAG
 #define LORA_RESET 14
 #endif
-#define LORA_DIO1 33 // Not really used
-#define LORA_DIO2 32 // Not really used
+#define LORA_DIO1 35 // Not really used
+#define LORA_DIO2 34 // Not really used
 
 // ratio of voltage divider = 3.20 (R1=100k, R2=220k)
 #define ADC_MULTIPLIER 3.2
diff --git a/variants/rak4631/variant.h b/variants/rak4631/variant.h
index bae5d957a..f1e144324 100644
--- a/variants/rak4631/variant.h
+++ b/variants/rak4631/variant.h
@@ -201,6 +201,9 @@ static const uint8_t SCK = PIN_SPI_SCK;
 // RAK12002 RTC Module
 #define RV3028_RTC (uint8_t) 0b1010010
 
+// RAK18001 Buzzer in Slot C
+#define PIN_BUZZER 21 // IO3 is PWM2
+
 // Battery
 // The battery sense is hooked to pin A0 (5)
 #define BATTERY_PIN PIN_A0