Fix argument problems