2.5 fixes