Crap for 3.9.6

CHANGES I DID A FEW MONTHS AGO BUT FORGOT TO PR