10.9 fixes