Fixes minor problems with arguments