10.2 fixes