Update command form arg fixes