Fixed changes to tools