more minor fixes to tools