Requestor's bugs - fixed