Small fixes in prep for v4 self-hosting #2633

Job	Run time
typecheck / typecheck	4m 56s
units / 🧪 Unit Tests	13m 29s
e2e / 🧪 CLI v3 tests (ubuntu-latest - npm)	2m 15s
e2e / 🧪 CLI v3 tests (ubuntu-latest - pnpm)	2m 12s
e2e / 🧪 CLI v3 tests (windows-latest - npm)	5m 40s
e2e / 🧪 CLI v3 tests (windows-latest - pnpm)	5m 4s
	33m 36s

Provide feedback