Added some argument typechecks