diff --git a/src/cli/commands/tools.lua b/src/cli/commands/tools.lua
index 28792db..51d96ac 100644
--- a/src/cli/commands/tools.lua
+++ b/src/cli/commands/tools.lua
@@ -7,12 +7,16 @@ local util_fs = require('src/lib/util/fs')
 local util_cmd = require('src/lib/util/cmd')
 
 local function bundler(args)
-    local path, file = args.file:match("(.-)([^/\\]+)$")
-    return zeebo_bundler.build(path, file, args.dist..file)
+    local d = util_fs.path(args.dist)
+    local f = util_fs.file(args.file)
+    zeebo_fs.clear(d.get_fullfilepath())
+    return zeebo_bundler.build(f.get_sys_path(), f.get_file(), d.get_sys_path()..f.get_file())
 end
 
 local function compiler(args)
-    return zeebo_compiler.build(args.file, args.dist)
+    local file = util_fs.file(args.file).get_fullfilepath()
+    local dist = util_fs.file(args.dist).get_fullfilepath()
+    return zeebo_compiler.build(file, dist)
 end
 
 local function love_zip(args)
diff --git a/tools/ci_luau-analyze.lua b/tools/ci_luau-analyze.lua
index eb3ddc8..712f006 100644
--- a/tools/ci_luau-analyze.lua
+++ b/tools/ci_luau-analyze.lua
@@ -14,6 +14,6 @@ if core == 'cli' then
 end
 
 cmd('./cli.sh build --bundler --core '..core)
-cmd(replace..'--format "function native_callback" --replace "local function _native_callback"')
+cmd(replace..' --format "function native_callback" --replace "local function _native_callback"')
 cmd('./cli.sh tool-package-del dist/main.lua third_party_json_rxi')
 cmd('./cli.sh tool-package-del dist/main.lua lib_engine_api_encoder')