Fixing CLI args II