Fixed arg issues in tools.