Fix cherry-pick errors