Minor changes of command options