fixes to Toolbox run method