Minor improvements to tools