10.8 fixes