Fixes for command line