Tolerant of more requests

Also finalized use of service as a guest