Fix some bugs with arguments