ENTRYPOINT fixups