Fix cmd/entrypoints