Fixing few commandline issues
Fixing few commandline issues