some fixes to tools