Fix regular commands to work with arguments