diff --git a/lib/tdeck_ui/UI/LXMF/UIManager.cpp b/lib/tdeck_ui/UI/LXMF/UIManager.cpp
index 0ad45b48..56cb6a13 100644
--- a/lib/tdeck_ui/UI/LXMF/UIManager.cpp
+++ b/lib/tdeck_ui/UI/LXMF/UIManager.cpp
@@ -8,7 +8,7 @@
 #include <lvgl.h>
 #include <Preferences.h>
 #include "Log.h"
-#include "tone/Tone.h"
+#include "Tone.h"
 #include "../LVGL/LVGLLock.h"
 #include "lxst_audio.h"
 #include "Packet.h"
diff --git a/platformio.ini b/platformio.ini
index 02b7ee6c..bce445e7 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -58,9 +58,9 @@ build_flags =
     -DARDUINO_USB_CDC_ON_BOOT=1
     -DARDUINO_USB_MODE=1
     -DLV_CONF_INCLUDE_SIMPLE
-    -I${PROJECT_DIR}/lib
-    -I${PROJECT_DIR}/deps/microReticulum/lib/libbz2
-    -I${PROJECT_DIR}/deps/microReticulum/src
+    -Ilib
+    -Ideps/microReticulum/lib/libbz2
+    -Ideps/microReticulum/src
     -DBZ_NO_STDIO
     -DUSE_BLUEDROID
     -Os
@@ -138,11 +138,9 @@ build_flags =
     -DARDUINO_USB_CDC_ON_BOOT=1
     -DARDUINO_USB_MODE=1
     -DLV_CONF_INCLUDE_SIMPLE
-    -I${PROJECT_DIR}/lib
-    -I${PROJECT_DIR}/deps/microReticulum/lib/libbz2
-    -I${PROJECT_DIR}/deps/microReticulum/src
-    -I.pio/libdeps/tdeck/TinyGPSPlus/src
-    -I.pio/libdeps/tdeck/NimBLE-Arduino/src
+    -Ilib
+    -Ideps/microReticulum/lib/libbz2
+    -Ideps/microReticulum/src
     -DBZ_NO_STDIO
     -DUSE_NIMBLE
     -DCONFIG_BT_NIMBLE_MEM_ALLOC_MODE_EXTERNAL=1
@@ -163,4 +161,4 @@ build_flags =
 [env:tdeck-ota]
 extends = env:tdeck
 upload_protocol = custom
-upload_command = python3 tools/espota.py -i pyxis-tdeck.local -p 3232 -f $SOURCE
+upload_command = "$PYTHONEXE" tools/espota.py -i pyxis-tdeck.local -p 3232 -f $SOURCE
diff --git a/src/main.cpp b/src/main.cpp
index 3cbad586..7efe5001 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -58,7 +58,7 @@
 #include <UI/LXMF/SettingsScreen.h>
 
 // Audio notifications
-#include "tone/Tone.h"
+#include "Tone.h"
 
 // Logging
 #include <Log.h>