Minor updates to passed arguments