backport typos