Fix command line options
Minor fixes