diff --git a/builder/main.py b/builder/main.py
index 4576448..d34c935 100644
--- a/builder/main.py
+++ b/builder/main.py
@@ -43,7 +43,7 @@ def generate_uf2(target, source, env):
     env.Execute(
         " ".join(
             [
-                join(platform.get_package_dir("tool-rp2040tools") or "", "elf2uf2"),
+                "elf2uf2",
                 '"%s"' % elf_file,
                 '"%s"' % elf_file.replace(".elf", ".uf2"),
             ]
@@ -156,7 +156,7 @@ elif upload_protocol == "picotool":
     env.Replace(
         UPLOADER=join(platform.get_package_dir("tool-rp2040tools") or "", "rp2040load"),
         UPLOADERFLAGS=["-v", "-D"],
-        UPLOADCMD="$UPLOADER $UPLOADERFLAGS $SOURCES"
+        UPLOADCMD='"$UPLOADER" $UPLOADERFLAGS $SOURCES'
     )
 
     upload_actions = [
diff --git a/platform.json b/platform.json
index d7c8569..d41d11c 100644
--- a/platform.json
+++ b/platform.json
@@ -18,7 +18,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-raspberrypi.git"
   },
-  "version": "1.2.0",
+  "version": "1.3.0",
   "frameworks": {
     "arduino": {
       "package": "framework-arduino-mbed",
@@ -35,7 +35,7 @@
       "type": "framework",
       "optional": true,
       "owner": "platformio",
-      "version": "~2.3.0"
+      "version": "~2.4.0"
     },
     "tool-rp2040tools": {
       "type": "uploader",