some more backports