Fixing CLI args