Fixing command line parameter issues