Fix argument checks