Slight tweaks to tools.