Fixed some function argument conventions.