more corrections on the backport