Fixing args issues.