fix(typo): backport some 3.2 typo correction