bug fixes in SameReceiverEntrypoint