Assorted toolbox fixes

review @retronym