diff --git a/main.go b/main.go
index 33ab4278..02923925 100644
--- a/main.go
+++ b/main.go
@@ -2,8 +2,6 @@ package main
 
 import (
 	"github.com/gptscript-ai/gptscript/pkg/cli"
-	// Load all VCS
-	_ "github.com/gptscript-ai/gptscript/pkg/loader/vcs"
 )
 
 func main() {
diff --git a/pkg/engine/cmd.go b/pkg/engine/cmd.go
index 33a67640..5b27a579 100644
--- a/pkg/engine/cmd.go
+++ b/pkg/engine/cmd.go
@@ -328,7 +328,7 @@ func (e *Engine) newCommand(ctx context.Context, extraEnv []string, tool types.T
 	}
 
 	if useShell {
-		args = append([]string{"/bin/sh", "-c"}, strings.Join(args, " "))
+		args = append([]string{"/bin/sh", "-c"}, "exec "+strings.Join(args, " "))
 	} else {
 		args[0] = env.Lookup(envvars, args[0])
 	}
diff --git a/pkg/gptscript/gptscript.go b/pkg/gptscript/gptscript.go
index 11afb7d6..679eb503 100644
--- a/pkg/gptscript/gptscript.go
+++ b/pkg/gptscript/gptscript.go
@@ -25,6 +25,9 @@ import (
 	"github.com/gptscript-ai/gptscript/pkg/repos/runtimes"
 	"github.com/gptscript-ai/gptscript/pkg/runner"
 	"github.com/gptscript-ai/gptscript/pkg/types"
+
+	// Load all VCS
+	_ "github.com/gptscript-ai/gptscript/pkg/loader/vcs"
 )
 
 var log = mvl.Package()