3.10 fixes