Toolbox Base Class fixes...