Fix argument processing