Fix command line tools