Fixed up command line args and params