Fixing bugs in entrypoints