Fixing command-line bugs