Command-line tools fix