Fix argument checks being inaccurate