fix extraneous volumes_dir reference
make the command line tools fix more defensive