Bug fixes for command line tools.