Fixes to arg matching