Fixed a couple of issues with arguments.