10.7 fixes