Fixing issues with requestor.