Fixed some argument ordering issues.