Changes to allow --tool_dir to be independant