Also fix the command-line tool.