Minor changes in CommandLineUtils