Fixed some issues with arguments