diff --git a/Extensions/Smooth_font.cpp b/Extensions/Smooth_font.cpp
index fc2023e..846f5d0 100644
--- a/Extensions/Smooth_font.cpp
+++ b/Extensions/Smooth_font.cpp
@@ -239,7 +239,6 @@ void TFT_eSPI::loadMetrics(void)
     bitmapPtr += gWidth[gNum] * gHeight[gNum];
 
     gNum++;
-    yield();
   }
 
   gFont.yAdvance = gFont.maxAscent + gFont.maxDescent;
@@ -574,7 +573,6 @@ void TFT_eSPI::showFont(uint32_t td)
     setCursor(cursorX, cursorY);
     drawGlyph(gUnicode[i]);
     cursorX += gxAdvance[i];
-    yield();
   }
 
   delay(timeDelay);
diff --git a/TFT_eSPI.cpp b/TFT_eSPI.cpp
index 07cc825..dbbb2a3 100644
--- a/TFT_eSPI.cpp
+++ b/TFT_eSPI.cpp
@@ -42,7 +42,7 @@
 #endif
 
 #include "freertos/task.h"
-#include "wiring_shift.h"
+#include "esp32-hal-spi.h"
 #include "esp32-hal-gpio.h"
 #include "esp32-hal-misc.h"
 
@@ -91,7 +91,7 @@ inline void TFT_eSPI::begin_tft_write(void){
   if (locked) {
     locked = false; // Flag to show SPI access now unlocked
 #if defined (SPI_HAS_TRANSACTION) && defined (SUPPORT_TRANSACTIONS) && !defined(TFT_PARALLEL_8_BIT) && !defined(RP2040_PIO_INTERFACE)
-    spi.beginTransaction(SPISettings(SPI_FREQUENCY, MSBFIRST, TFT_SPI_MODE));
+    spi.beginTransaction(SPISettings(SPI_FREQUENCY, SPI_MSBFIRST, TFT_SPI_MODE));
 #endif
     CS_L;
     SET_BUS_WRITE_MODE;  // Some processors (e.g. ESP32) allow recycling the tx buffer when rx is not used
@@ -103,7 +103,7 @@ void TFT_eSPI::begin_nin_write(void){
   if (locked) {
     locked = false; // Flag to show SPI access now unlocked
 #if defined (SPI_HAS_TRANSACTION) && defined (SUPPORT_TRANSACTIONS) && !defined(TFT_PARALLEL_8_BIT) && !defined(RP2040_PIO_INTERFACE)
-    spi.beginTransaction(SPISettings(SPI_FREQUENCY, MSBFIRST, TFT_SPI_MODE));
+    spi.beginTransaction(SPISettings(SPI_FREQUENCY, SPI_MSBFIRST, TFT_SPI_MODE));
 #endif
     CS_L;
     SET_BUS_WRITE_MODE;  // Some processors (e.g. ESP32) allow recycling the tx buffer when rx is not used
@@ -155,7 +155,7 @@ inline void TFT_eSPI::begin_tft_read(void){
 #if defined (SPI_HAS_TRANSACTION) && defined (SUPPORT_TRANSACTIONS) && !defined(TFT_PARALLEL_8_BIT) && !defined(RP2040_PIO_INTERFACE)
   if (locked) {
     locked = false;
-    spi.beginTransaction(SPISettings(SPI_READ_FREQUENCY, MSBFIRST, TFT_SPI_MODE));
+    spi.beginTransaction(SPISettings(SPI_READ_FREQUENCY, SPI_MSBFIRST, TFT_SPI_MODE));
     CS_L;
   }
 #else