Command line tools fixes