More backports to 0.21

Some more backports for an 0.21.2.