Fixed issues with the types and count of arguments.