diff --git a/src/bme_utils.cpp b/src/bme_utils.cpp
index 2e2acab..e8b2cba 100644
--- a/src/bme_utils.cpp
+++ b/src/bme_utils.cpp
@@ -33,11 +33,11 @@ namespace BME_Utils {
         uint8_t err, addr;
         for(addr = 1; addr < 0x7F; addr++) {
             #if defined(HELTEC_V3) || defined(HELTEC_WSL_V3) || defined(HELTEC_WSL_V3_DISPLAY)
-            Wire1.beginTransmission(addr);
-            err = Wire1.endTransmission();
+                Wire1.beginTransmission(addr);
+                err = Wire1.endTransmission();
             #else
-            Wire.beginTransmission(addr);
-            err = Wire.endTransmission();
+                Wire.beginTransmission(addr);
+                err = Wire.endTransmission();
             #endif
             if (err == 0) {
                 //Serial.println(addr); this shows any connected board to I2C
diff --git a/src/display.cpp b/src/display.cpp
index 5d875b5..c7b76d5 100644
--- a/src/display.cpp
+++ b/src/display.cpp
@@ -67,10 +67,6 @@ void displaySetup() {
                     digitalWrite(OLED_RST, HIGH);
                 #endif
 
-                #if defined(HELTEC_WS) || defined(HELTEC_WSL_V3_DISPLAY)
-                    Wire.begin(BOARD_I2C_SDA, BOARD_I2C_SCL);
-                #endif
-
                 if(!display.begin(SSD1306_SWITCHCAPVCC, SCREEN_ADDRESS)) { 
                     Serial.println(F("SSD1306 allocation failed"));
                     for(;;); // Don't proceed, loop forever
diff --git a/src/power_utils.cpp b/src/power_utils.cpp
index f4e60bc..78af6e7 100644
--- a/src/power_utils.cpp
+++ b/src/power_utils.cpp
@@ -163,13 +163,17 @@ namespace POWER_Utils {
             pinMode(ADC_CTRL, OUTPUT);
         #endif
 
-        #if defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_WP)
+        #if defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_WS)
             Wire.begin(BOARD_I2C_SDA, BOARD_I2C_SCL);
         #endif
 
-        #if defined(HELTEC_V3) || defined(HELTEC_WSL_V3) || defined(HELTEC_WP) || defined(HELTEC_WSL_V3_DISPLAY)
+        #if defined(HELTEC_V3) || defined(HELTEC_WP) || defined(HELTEC_WSL_V3) || defined(HELTEC_WSL_V3_DISPLAY)
             Wire1.begin(BOARD_I2C_SDA, BOARD_I2C_SCL);
         #endif
+
+        #if defined(HELTEC_V3)
+            Wire.begin(OLED_SDA, OLED_SCL);
+        #endif
         
         delay(1000);
         BATTERY_Utils::setup();