Tried to fix issues in benchmoark and baseworker