Fix multi argument commands