Minor update to argument handling