Fix argument quoting
Clean up extra parameters