Fix some entrypoint issues