Fixes for command line.