Fix requestor issues