Small fixes in prep for v4 self-hosting #2632

Job	Run time
units / 🧪 Unit Tests	6m 39s
typecheck / typecheck	4m 50s
e2e / 🧪 CLI v3 tests (ubuntu-latest - npm)	2m 22s
e2e / 🧪 CLI v3 tests (ubuntu-latest - pnpm)	2m 20s
e2e / 🧪 CLI v3 tests (windows-latest - npm)	4m 30s
e2e / 🧪 CLI v3 tests (windows-latest - pnpm)	5m 41s
	26m 22s

Provide feedback