More 3.8 fixes