Some more toolbox fixes