diff --git a/src/SPC/store/pkg/GoXcaddy.php b/src/SPC/store/pkg/GoXcaddy.php
index c61511a3..ca727ecd 100644
--- a/src/SPC/store/pkg/GoXcaddy.php
+++ b/src/SPC/store/pkg/GoXcaddy.php
@@ -26,6 +26,9 @@ class GoXcaddy extends CustomPackage
         $pkgroot = PKG_ROOT_PATH;
         $go_exec = "{$pkgroot}/{$name}/bin/go";
         $xcaddy_exec = "{$pkgroot}/{$name}/bin/xcaddy";
+        if ($force) {
+            FileSystem::removeDir("{$pkgroot}/{$name}");
+        }
         if (file_exists($go_exec) && file_exists($xcaddy_exec)) {
             return;
         }
diff --git a/src/SPC/store/pkg/Zig.php b/src/SPC/store/pkg/Zig.php
index ded55120..aa06922f 100644
--- a/src/SPC/store/pkg/Zig.php
+++ b/src/SPC/store/pkg/Zig.php
@@ -26,12 +26,12 @@ class Zig extends CustomPackage
     {
         $pkgroot = PKG_ROOT_PATH;
         $zig_exec = match (PHP_OS_FAMILY) {
-            'Windows' => "{$pkgroot}/{$name}/bin/zig.exe",
-            default => "{$pkgroot}/{$name}/bin/zig",
+            'Windows' => "{$pkgroot}/{$name}/zig.exe",
+            default => "{$pkgroot}/{$name}/zig",
         };
 
         if ($force) {
-            FileSystem::removeDir($pkgroot . '/' . $name);
+            FileSystem::removeDir("{$pkgroot}/{$name}");
         }
 
         if (file_exists($zig_exec)) {