Fixes for new command line options.