Fixes to command line processing