Fixed argv parsing starting at wrong index for CLI