[3.7] 3.7 fixes