Second batch of fixes to ResearcherManager