Fix entrypoints