Fixes to external strategies and HybridInterpreter