Fixes for running under the ResearchAssistant environment