Fix argument parsing