diff --git a/platformio.ini b/platformio.ini
index fa701a8..94b7480 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -93,7 +93,7 @@ lib_deps =
 	adafruit/Adafruit SSD1306 @ 2.5.10
 
 [env:heltec_wireless_stick]
-board = heltec_wifi_lora_32_V3
+board = esp32-s3-devkitc-1
 board_build.mcu = esp32s3
 build_flags = 
 	-Werror -Wall
diff --git a/src/boards_pinout.h b/src/boards_pinout.h
index b565abb..c847cda 100644
--- a/src/boards_pinout.h
+++ b/src/boards_pinout.h
@@ -140,7 +140,7 @@
     #define OLED_RST    -1      // Reset pin # (or -1 if sharing Arduino reset pin)
 #endif
 
-#ifdef HELTEC_V2
+#if defined(HELTEC_V2)
     #define OLED_SDA    4
     #define OLED_SCL    15
     #define OLED_RST    16
@@ -179,7 +179,7 @@
     #define INTERNAL_LED_PIN    35
     #define BATTERY_PIN         1
     #define VEXT_CTRL           36
-    #define ADC_CTRL            37 // Heltec WSL_V3 just like Heltec WT
+    #define ADC_CTRL            37
     #define BOARD_I2C_SDA       41
     #define BOARD_I2C_SCL       42
     #ifdef HELTEC_WSL_V3_DISPLAY
diff --git a/src/display.cpp b/src/display.cpp
index 71a293f..60b596c 100644
--- a/src/display.cpp
+++ b/src/display.cpp
@@ -67,7 +67,7 @@ void displaySetup() {
                     digitalWrite(OLED_RST, HIGH);
                 #endif
 
-                #ifndef HELTEC_WSL_V3_DISPLAY
+                #if defined(HELTEC_WS) || defined(HELTEC_WSL_V3_DISPLAY)
                     Wire.begin(OLED_SDA, OLED_SCL);
                 #endif
 
diff --git a/src/power_utils.cpp b/src/power_utils.cpp
index f4e70a9..30ee7c8 100644
--- a/src/power_utils.cpp
+++ b/src/power_utils.cpp
@@ -167,7 +167,7 @@ namespace POWER_Utils {
             Wire.begin(BOARD_I2C_SDA, BOARD_I2C_SCL);
         #endif
 
-        #if defined(HELTEC_V3) || defined(HELTEC_WSL_V3) || defined(HELTEC_WSL_V3_DISPLAY)
+        #if defined(HELTEC_V3) || defined(HELTEC_WSL_V3) || defined(HELTEC_WP) || defined(HELTEC_WSL_V3_DISPLAY)
             Wire1.begin(BOARD_I2C_SDA, BOARD_I2C_SCL);
         #endif